From d959bf1ca51cddcd5810a1be44e3391c8965dd59 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Wed, 14 Sep 2011 23:41:59 +0200 Subject: [PATCH] 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. --- ChangeLog | 20 ++++++++++++++++++++ m4/acosl.m4 | 4 ++-- m4/argp.m4 | 6 +++--- m4/asinl.m4 | 4 ++-- m4/atanl.m4 | 4 ++-- m4/cosl.m4 | 4 ++-- m4/expl.m4 | 4 ++-- m4/frexpl.m4 | 6 +++--- m4/getloadavg.m4 | 10 +++++----- m4/ldexpl.m4 | 4 ++-- m4/logl.m4 | 4 ++-- m4/printf-frexpl.m4 | 6 +++--- m4/sinl.m4 | 4 ++-- m4/sqrtl.m4 | 4 ++-- m4/tanl.m4 | 4 ++-- 15 files changed, 54 insertions(+), 34 deletions(-) diff --git a/ChangeLog b/ChangeLog index 52fe92daf..db6e5593e 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,23 @@ +2011-09-14 Bruno Haible + + 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. + 2011-09-14 Eric Blake opendir: avoid compile warning diff --git a/m4/acosl.m4 b/m4/acosl.m4 index 759be4259..f25ee2331 100644 --- a/m4/acosl.m4 +++ b/m4/acosl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_ACOSL], || 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 . - AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [#include ]) + AC_CHECK_DECL([acosl], , [HAVE_DECL_ACOSL=0], [[#include ]]) else HAVE_DECL_ACOSL=0 HAVE_ACOSL=0 diff --git a/m4/argp.m4 b/m4/argp.m4 index 4e3940a65..a9963ee6d 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -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 @@ AC_DEFUN([gl_ARGP], [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 ]) + [[#include ]]) 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 ]) + [[#include ]]) # Check if program_invocation_name and program_invocation_short_name # are defined elsewhere. It is improbable that only one of them will diff --git a/m4/asinl.m4 b/m4/asinl.m4 index 882a8d316..2df266325 100644 --- a/m4/asinl.m4 +++ b/m4/asinl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_ASINL], || 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 . - AC_CHECK_DECL([asinl], , [HAVE_DECL_ASINL=0], [#include ]) + AC_CHECK_DECL([asinl], , [HAVE_DECL_ASINL=0], [[#include ]]) else HAVE_DECL_ASINL=0 HAVE_ASINL=0 diff --git a/m4/atanl.m4 b/m4/atanl.m4 index 52914f6ec..82c9cd409 100644 --- a/m4/atanl.m4 +++ b/m4/atanl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_ATANL], || 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 . - AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [#include ]) + AC_CHECK_DECL([atanl], , [HAVE_DECL_ATANL=0], [[#include ]]) else HAVE_DECL_ATANL=0 HAVE_ATANL=0 diff --git a/m4/cosl.m4 b/m4/cosl.m4 index 3cb90029a..75472ee8b 100644 --- a/m4/cosl.m4 +++ b/m4/cosl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_COSL], || 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 . - AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [#include ]) + AC_CHECK_DECL([cosl], , [HAVE_DECL_COSL=0], [[#include ]]) else HAVE_DECL_COSL=0 HAVE_COSL=0 diff --git a/m4/expl.m4 b/m4/expl.m4 index 8f1a9a978..c9c1b7b9e 100644 --- a/m4/expl.m4 +++ b/m4/expl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_EXPL], || 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 . - AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [#include ]) + AC_CHECK_DECL([expl], , [HAVE_DECL_EXPL=0], [[#include ]]) else HAVE_DECL_EXPL=0 HAVE_EXPL=0 diff --git a/m4/frexpl.m4 b/m4/frexpl.m4 index 5843fa2f5..e9f9964dc 100644 --- a/m4/frexpl.m4 +++ b/m4/frexpl.m4 @@ -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_DEFUN([gl_FUNC_FREXPL], 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 . - AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include ]) + AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include ]]) FREXPL_LIBM= if test $HAVE_DECL_FREXPL = 1; then gl_CHECK_FREXPL_NO_LIBM @@ -58,7 +58,7 @@ AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM], 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 . - AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include ]) + AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include ]]) if test $HAVE_DECL_FREXPL = 1; then gl_CHECK_FREXPL_NO_LIBM if test $gl_cv_func_frexpl_no_libm = yes; then diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index b75e05fa0..b16f40de0 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -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 @@ else HAVE_SYS_LOADAVG_H=0 fi AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0], - [#if HAVE_SYS_LOADAVG_H - # include - #endif - #include ]) + [[#if HAVE_SYS_LOADAVG_H + # include + #endif + #include ]]) ])# gl_GETLOADAVG diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4 index 76101f336..4e419cf20 100644 --- a/m4/ldexpl.m4 +++ b/m4/ldexpl.m4 @@ -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_DEFUN([gl_FUNC_LDEXPL], 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 . - AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include ]) + AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include ]]) LDEXPL_LIBM= if test $HAVE_DECL_LDEXPL = 1; then gl_CHECK_LDEXPL_NO_LIBM diff --git a/m4/logl.m4 b/m4/logl.m4 index dfc301a92..70a5eadfc 100644 --- a/m4/logl.m4 +++ b/m4/logl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_LOGL], || 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 . - AC_CHECK_DECL([logl], , [HAVE_DECL_LOGL=0], [#include ]) + AC_CHECK_DECL([logl], , [HAVE_DECL_LOGL=0], [[#include ]]) else HAVE_DECL_LOGL=0 HAVE_LOGL=0 diff --git a/m4/printf-frexpl.m4 b/m4/printf-frexpl.m4 index 9c13d4e7f..9b698c9be 100644 --- a/m4/printf-frexpl.m4 +++ b/m4/printf-frexpl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL], [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 . - AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [#include ]) + AC_CHECK_DECL([frexpl], , [HAVE_DECL_FREXPL=0], [[#include ]]) fi gl_CHECK_LDEXPL_NO_LIBM @@ -39,7 +39,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL], [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 . - AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [#include ]) + AC_CHECK_DECL([ldexpl], , [HAVE_DECL_LDEXPL=0], [[#include ]]) ;; esac fi diff --git a/m4/sinl.m4 b/m4/sinl.m4 index 5666cab79..510c9b7e8 100644 --- a/m4/sinl.m4 +++ b/m4/sinl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_SINL], || 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 . - AC_CHECK_DECL([sinl], , [HAVE_DECL_SINL=0], [#include ]) + AC_CHECK_DECL([sinl], , [HAVE_DECL_SINL=0], [[#include ]]) else HAVE_DECL_SINL=0 HAVE_SINL=0 diff --git a/m4/sqrtl.m4 b/m4/sqrtl.m4 index 87ffc3719..aa8522b8c 100644 --- a/m4/sqrtl.m4 +++ b/m4/sqrtl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_SQRTL], || 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 . - AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [#include ]) + AC_CHECK_DECL([sqrtl], , [HAVE_DECL_SQRTL=0], [[#include ]]) else HAVE_DECL_SQRTL=0 HAVE_SQRTL=0 diff --git a/m4/tanl.m4 b/m4/tanl.m4 index 5f3f73eb7..db45e0ca4 100644 --- a/m4/tanl.m4 +++ b/m4/tanl.m4 @@ -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 @@ AC_DEFUN([gl_FUNC_TANL], || 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 . - AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [#include ]) + AC_CHECK_DECL([tanl], , [HAVE_DECL_TANL=0], [[#include ]]) else HAVE_DECL_TANL=0 HAVE_TANL=0 -- 2.11.0