[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
Re: m4 brackets question
|
From: |
Bruno Haible |
|
Subject: |
Re: m4 brackets question |
|
Date: |
Wed, 14 Sep 2011 23:44:40 +0200 |
|
User-agent: |
KMail/1.13.6 (Linux/2.6.37.6-0.5-desktop; KDE/4.6.0; x86_64; ; ) |
Eric Blake wrote:
> Underquoted (and autoconf has magic in AC_CHECK_DECL that tries to deal
> with the underquoting, since this is so common), since the fourth
> argument of AC_CHECK_DECL is supposed to allow further m4 macro
> expansion when used properly. Should be:
>
> AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [[#include <math.h>]])
OK, I'm applying this:
2011-09-14 Bruno Haible <address@hidden>
Properly quote AC_CHECK_DECL's 4th argument.
* m4/acosl.m4 (gl_FUNC_ACOSL): Double-quote AC_CHECK_DECL's 4th
argument.
* m4/argp.m4 (gl_ARGP): Likewise.
* m4/asinl.m4 (gl_FUNC_ASINL): Likewise.
* m4/atanl.m4 (gl_FUNC_ATANL): Likewise.
* m4/cosl.m4 (gl_FUNC_COSL): Likewise.
* m4/expl.m4 (gl_FUNC_EXPL): Likewise.
* m4/frexpl.m4 (gl_FUNC_FREXPL, gl_FUNC_FREXPL_NO_LIBM): Likewise.
* m4/getloadavg.m4 (gl_GETLOADAVG): Likewise.
* m4/ldexpl.m4 (gl_FUNC_LDEXPL): Likewise.
* m4/logl.m4 (gl_FUNC_LOGL): Likewise.
* m4/printf-frexpl.m4 (gl_FUNC_PRINTF_FREXPL): Likewise.
* m4/sinl.m4 (gl_FUNC_SINL): Likewise.
* m4/sqrtl.m4 (gl_FUNC_SQRTL): Likewise.
* m4/tanl.m4 (gl_FUNC_TANL): Likewise.
Reported by Eric Blake.
--- m4/acosl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/acosl.m4 Wed Sep 14 23:18:30 2011
@@ -1,4 +1,4 @@
-# acosl.m4 serial 4
+# acosl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_acosl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has acosl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [#include <math.h>])
+ AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [[#include <math.h>]])
else
HAVE_DECL_ACOSL=0
HAVE_ACOSL=0
--- m4/argp.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/argp.m4 Wed Sep 14 23:28:42 2011
@@ -1,4 +1,4 @@
-# argp.m4 serial 12
+# argp.m4 serial 13
dnl Copyright (C) 2003-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -15,13 +15,13 @@
[Define if program_invocation_name is declared])],
[AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1],
[Define to 1 to add extern declaration of
program_invocation_name to argp.h])],
- [#include <errno.h>])
+ [[#include <errno.h>]])
AC_CHECK_DECL([program_invocation_short_name],
[AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME], [1],
[Define if program_invocation_short_name is
declared])],
[AC_DEFINE([GNULIB_PROGRAM_INVOCATION_SHORT_NAME], [1],
[Define to 1 to add extern declaration of
program_invocation_short_name to argp.h])],
- [#include <errno.h>])
+ [[#include <errno.h>]])
# Check if program_invocation_name and program_invocation_short_name
# are defined elsewhere. It is improbable that only one of them will
--- m4/asinl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/asinl.m4 Wed Sep 14 23:20:46 2011
@@ -1,4 +1,4 @@
-# asinl.m4 serial 4
+# asinl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_asinl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has asinl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([asinl], , [HAVE_DECL_ASINL=0], [#include <math.h>])
+ AC_CHECK_DECL([asinl], , [HAVE_DECL_ASINL=0], [[#include <math.h>]])
else
HAVE_DECL_ASINL=0
HAVE_ASINL=0
--- m4/atanl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/atanl.m4 Wed Sep 14 23:21:07 2011
@@ -1,4 +1,4 @@
-# atanl.m4 serial 4
+# atanl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_atanl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has atanl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [#include <math.h>])
+ AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [[#include <math.h>]])
else
HAVE_DECL_ATANL=0
HAVE_ATANL=0
--- m4/cosl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/cosl.m4 Wed Sep 14 23:21:30 2011
@@ -1,4 +1,4 @@
-# cosl.m4 serial 4
+# cosl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_cosl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has cosl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [#include <math.h>])
+ AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [[#include <math.h>]])
else
HAVE_DECL_COSL=0
HAVE_COSL=0
--- m4/expl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/expl.m4 Wed Sep 14 23:22:00 2011
@@ -1,4 +1,4 @@
-# expl.m4 serial 3
+# expl.m4 serial 4
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_expl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has expl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [#include <math.h>])
+ AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [[#include <math.h>]])
else
HAVE_DECL_EXPL=0
HAVE_EXPL=0
--- m4/frexpl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/frexpl.m4 Wed Sep 14 23:22:32 2011
@@ -1,4 +1,4 @@
-# frexpl.m4 serial 16
+# frexpl.m4 serial 17
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -9,7 +9,7 @@
AC_REQUIRE([gl_MATH_H_DEFAULTS])
dnl Check whether it's declared.
dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
+ AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]])
FREXPL_LIBM=
if test $HAVE_DECL_FREXPL = 1; then
gl_CHECK_FREXPL_NO_LIBM
@@ -58,7 +58,7 @@
AC_REQUIRE([gl_MATH_H_DEFAULTS])
dnl Check whether it's declared.
dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
+ AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]])
if test $HAVE_DECL_FREXPL = 1; then
gl_CHECK_FREXPL_NO_LIBM
if test $gl_cv_func_frexpl_no_libm = yes; then
--- m4/getloadavg.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/getloadavg.m4 Wed Sep 14 23:29:15 2011
@@ -7,7 +7,7 @@
# gives unlimited permission to copy and/or distribute it,
# with or without modifications, as long as this notice is preserved.
-#serial 4
+#serial 5
# Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent.
# New applications should use gl_GETLOADAVG instead.
@@ -91,10 +91,10 @@
HAVE_SYS_LOADAVG_H=0
fi
AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0],
- [#if HAVE_SYS_LOADAVG_H
- # include <sys/loadavg.h>
- #endif
- #include <stdlib.h>])
+ [[#if HAVE_SYS_LOADAVG_H
+ # include <sys/loadavg.h>
+ #endif
+ #include <stdlib.h>]])
])# gl_GETLOADAVG
--- m4/ldexpl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/ldexpl.m4 Wed Sep 14 23:22:50 2011
@@ -1,4 +1,4 @@
-# ldexpl.m4 serial 12
+# ldexpl.m4 serial 13
dnl Copyright (C) 2007-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -10,7 +10,7 @@
AC_REQUIRE([gl_FUNC_ISNANL]) dnl for ISNANL_LIBM
dnl Check whether it's declared.
dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include <math.h>])
+ AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include <math.h>]])
LDEXPL_LIBM=
if test $HAVE_DECL_LDEXPL = 1; then
gl_CHECK_LDEXPL_NO_LIBM
--- m4/logl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/logl.m4 Wed Sep 14 23:41:06 2011
@@ -1,4 +1,4 @@
-# logl.m4 serial 4
+# logl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_logl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has logl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([logl], , [HAVE_DECL_LOGL=0], [#include <math.h>])
+ AC_CHECK_DECL([logl], , [HAVE_DECL_LOGL=0], [[#include <math.h>]])
else
HAVE_DECL_LOGL=0
HAVE_LOGL=0
--- m4/printf-frexpl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/printf-frexpl.m4 Wed Sep 14 23:23:40 2011
@@ -1,4 +1,4 @@
-# printf-frexpl.m4 serial 7
+# printf-frexpl.m4 serial 8
dnl Copyright (C) 2007, 2009-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -27,7 +27,7 @@
[Define if the frexpl function is available in libc.])
dnl Also check whether it's declared.
dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include <math.h>])
+ AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include <math.h>]])
fi
gl_CHECK_LDEXPL_NO_LIBM
@@ -39,7 +39,7 @@
[Define if the ldexpl function is available in libc.])
dnl Also check whether it's declared.
dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in
<math.h>.
- AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include <math.h>])
+ AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include <math.h>]])
;;
esac
fi
--- m4/sinl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/sinl.m4 Wed Sep 14 23:25:07 2011
@@ -1,4 +1,4 @@
-# sinl.m4 serial 4
+# sinl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_sinl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has sinl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([sinl], , [HAVE_DECL_SINL=0], [#include <math.h>])
+ AC_CHECK_DECL([sinl], , [HAVE_DECL_SINL=0], [[#include <math.h>]])
else
HAVE_DECL_SINL=0
HAVE_SINL=0
--- m4/sqrtl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/sqrtl.m4 Wed Sep 14 23:24:44 2011
@@ -1,4 +1,4 @@
-# sqrtl.m4 serial 4
+# sqrtl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_sqrtl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has sqrtl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [#include <math.h>])
+ AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [[#include <math.h>]])
else
HAVE_DECL_SQRTL=0
HAVE_SQRTL=0
--- m4/tanl.m4.orig Wed Sep 14 23:41:27 2011
+++ m4/tanl.m4 Wed Sep 14 23:24:18 2011
@@ -1,4 +1,4 @@
-# tanl.m4 serial 4
+# tanl.m4 serial 5
dnl Copyright (C) 2010-2011 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -51,7 +51,7 @@
|| test $gl_cv_func_tanl_in_libm = yes; then
dnl Also check whether it's declared.
dnl MacOS X 10.3 has tanl() in libc but doesn't declare it in <math.h>.
- AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [#include <math.h>])
+ AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [[#include <math.h>]])
else
HAVE_DECL_TANL=0
HAVE_TANL=0
--
In memoriam Jerzy Popiełuszko <http://en.wikipedia.org/wiki/Jerzy_Popiełuszko>