From f76a70dc0244757b8aa890113e41fb2fe1da2244 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Thu, 15 Sep 2011 00:23:57 +0200 Subject: [PATCH] Properly quote AC_CHECK_DECLS' 4th argument. * m4/c-stack.m4 (gl_PREREQ_C_STACK): Double-quote AC_CHECK_DECLS' 4th argument. * m4/ceilf.m4 (gl_FUNC_CEILF): Likewise. * m4/ceill.m4 (gl_FUNC_CEILL): Likewise. * m4/dirfd.m4 (gl_FUNC_DIRFD): Likewise. * m4/floorf.m4 (gl_FUNC_FLOORF): Likewise. * m4/floorl.m4 (gl_FUNC_FLOORL): Likewise. * m4/fnmatch.m4 (gl_PREREQ_FNMATCH): Likewise. * m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Likewise. * m4/getdomainname.m4 (gl_FUNC_GETDOMAINNAME): Likewise. * m4/gethrxtime.m4 (gl_GETHRXTIME): Likewise. * m4/getpass.m4 (gl_PREREQ_GETPASS): Likewise. * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Likewise. * m4/inet_pton.m4 (gl_FUNC_INET_PTON): Likewise. * m4/isfinite.m4 (gl_ISFINITE): Likewise. * m4/isinf.m4 (gl_ISINF): Likewise. * m4/logb.m4 (gl_FUNC_LOGB): Likewise. * m4/readutmp.m4 (gl_READUTMP): Likewise. * m4/regex.m4 (gl_PREREQ_REGEX): Likewise. * m4/round.m4 (gl_FUNC_ROUND): Likewise. * m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. * m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. * m4/signbit.m4 (gl_SIGNBIT): Likewise. * m4/sleep.m4 (gl_FUNC_SLEEP): Likewise. * m4/strsignal.m4 (gl_PREREQ_STRSIGNAL): Likewise. * m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. * m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. * m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. * m4/vasnprintf.m4 (gl_PREREQ_VASNPRINTF): Likewise. * m4/wctob.m4 (gl_FUNC_WCTOB): Likewise. * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. Reported by Eric Blake. --- ChangeLog | 34 ++++++++++++++++++++++++++++++++++ m4/c-stack.m4 | 4 ++-- m4/ceilf.m4 | 4 ++-- m4/ceill.m4 | 4 ++-- m4/dirfd.m4 | 6 +++--- m4/floorf.m4 | 4 ++-- m4/floorl.m4 | 4 ++-- m4/fnmatch.m4 | 4 ++-- m4/getaddrinfo.m4 | 6 +++--- m4/getdomainname.m4 | 20 ++++++++++---------- m4/gethrxtime.m4 | 4 ++-- m4/getpass.m4 | 10 +++++----- m4/inet_ntop.m4 | 12 ++++++------ m4/inet_pton.m4 | 12 ++++++------ m4/isfinite.m4 | 4 ++-- m4/isinf.m4 | 4 ++-- m4/logb.m4 | 4 ++-- m4/readutmp.m4 | 6 +++--- m4/regex.m4 | 4 ++-- m4/round.m4 | 4 ++-- m4/roundf.m4 | 6 +++--- m4/roundl.m4 | 6 +++--- m4/signbit.m4 | 8 ++++---- m4/sleep.m4 | 4 ++-- m4/strsignal.m4 | 4 ++-- m4/trunc.m4 | 4 ++-- m4/truncf.m4 | 4 ++-- m4/truncl.m4 | 4 ++-- m4/vasnprintf.m4 | 4 ++-- m4/wctob.m4 | 6 +++--- m4/wcwidth.m4 | 6 +++--- 31 files changed, 122 insertions(+), 88 deletions(-) diff --git a/ChangeLog b/ChangeLog index db6e5593e..7ea82f976 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,39 @@ 2011-09-14 Bruno Haible + Properly quote AC_CHECK_DECLS' 4th argument. + * m4/c-stack.m4 (gl_PREREQ_C_STACK): Double-quote AC_CHECK_DECLS' 4th + argument. + * m4/ceilf.m4 (gl_FUNC_CEILF): Likewise. + * m4/ceill.m4 (gl_FUNC_CEILL): Likewise. + * m4/dirfd.m4 (gl_FUNC_DIRFD): Likewise. + * m4/floorf.m4 (gl_FUNC_FLOORF): Likewise. + * m4/floorl.m4 (gl_FUNC_FLOORL): Likewise. + * m4/fnmatch.m4 (gl_PREREQ_FNMATCH): Likewise. + * m4/getaddrinfo.m4 (gl_PREREQ_GETADDRINFO): Likewise. + * m4/getdomainname.m4 (gl_FUNC_GETDOMAINNAME): Likewise. + * m4/gethrxtime.m4 (gl_GETHRXTIME): Likewise. + * m4/getpass.m4 (gl_PREREQ_GETPASS): Likewise. + * m4/inet_ntop.m4 (gl_FUNC_INET_NTOP): Likewise. + * m4/inet_pton.m4 (gl_FUNC_INET_PTON): Likewise. + * m4/isfinite.m4 (gl_ISFINITE): Likewise. + * m4/isinf.m4 (gl_ISINF): Likewise. + * m4/logb.m4 (gl_FUNC_LOGB): Likewise. + * m4/readutmp.m4 (gl_READUTMP): Likewise. + * m4/regex.m4 (gl_PREREQ_REGEX): Likewise. + * m4/round.m4 (gl_FUNC_ROUND): Likewise. + * m4/roundf.m4 (gl_FUNC_ROUNDF): Likewise. + * m4/roundl.m4 (gl_FUNC_ROUNDL): Likewise. + * m4/signbit.m4 (gl_SIGNBIT): Likewise. + * m4/sleep.m4 (gl_FUNC_SLEEP): Likewise. + * m4/strsignal.m4 (gl_PREREQ_STRSIGNAL): Likewise. + * m4/trunc.m4 (gl_FUNC_TRUNC): Likewise. + * m4/truncf.m4 (gl_FUNC_TRUNCF): Likewise. + * m4/truncl.m4 (gl_FUNC_TRUNCL): Likewise. + * m4/vasnprintf.m4 (gl_PREREQ_VASNPRINTF): Likewise. + * m4/wctob.m4 (gl_FUNC_WCTOB): Likewise. + * m4/wcwidth.m4 (gl_FUNC_WCWIDTH): Likewise. + Reported by Eric Blake. + Properly quote AC_CHECK_DECL's 4th argument. * m4/acosl.m4 (gl_FUNC_ACOSL): Double-quote AC_CHECK_DECL's 4th argument. diff --git a/m4/c-stack.m4 b/m4/c-stack.m4 index 8d34048e4..e8917e6ad 100644 --- a/m4/c-stack.m4 +++ b/m4/c-stack.m4 @@ -7,7 +7,7 @@ # Written by Paul Eggert. -# serial 13 +# serial 14 AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC], [ @@ -338,7 +338,7 @@ AC_DEFUN([gl_PREREQ_C_STACK], AC_REQUIRE([AC_FUNC_ALLOCA]) AC_CHECK_FUNCS_ONCE([sigaltstack]) - AC_CHECK_DECLS([sigaltstack], , , [#include ]) + AC_CHECK_DECLS([sigaltstack], , , [[#include ]]) AC_CHECK_HEADERS_ONCE([unistd.h ucontext.h]) diff --git a/m4/ceilf.m4 b/m4/ceilf.m4 index 8b74a6d24..59f52f5b0 100644 --- a/m4/ceilf.m4 +++ b/m4/ceilf.m4 @@ -1,4 +1,4 @@ -# ceilf.m4 serial 11 +# ceilf.m4 serial 12 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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_CEILF], dnl Persuade glibc to declare ceilf(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether ceilf() is declared. - AC_CHECK_DECLS([ceilf], , , [#include ]) + AC_CHECK_DECLS([ceilf], , , [[#include ]]) if test "$ac_cv_have_decl_ceilf" = yes; then dnl Test whether ceilf() can be used without libm. gl_FUNC_CEILF_LIBS diff --git a/m4/ceill.m4 b/m4/ceill.m4 index 6b5682092..40adaf12f 100644 --- a/m4/ceill.m4 +++ b/m4/ceill.m4 @@ -1,4 +1,4 @@ -# ceill.m4 serial 10 +# ceill.m4 serial 11 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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_CEILL], dnl Persuade glibc to declare ceill(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether ceill() is declared. - AC_CHECK_DECLS([ceill], , , [#include ]) + AC_CHECK_DECLS([ceill], , , [[#include ]]) if test "$ac_cv_have_decl_ceill" = yes; then dnl Test whether ceill() can be used without libm. gl_FUNC_CEILL_LIBS diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index 62dcd8830..ea75e4e7a 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,4 +1,4 @@ -# serial 21 -*- Autoconf -*- +# serial 22 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. @@ -18,8 +18,8 @@ AC_DEFUN([gl_FUNC_DIRFD], AC_CHECK_FUNCS([dirfd]) AC_CHECK_DECLS([dirfd], , , - [#include - #include ]) + [[#include + #include ]]) if test $ac_cv_have_decl_dirfd = no; then HAVE_DECL_DIRFD=0 fi diff --git a/m4/floorf.m4 b/m4/floorf.m4 index aa76f8cae..83bfc78bc 100644 --- a/m4/floorf.m4 +++ b/m4/floorf.m4 @@ -1,4 +1,4 @@ -# floorf.m4 serial 10 +# floorf.m4 serial 11 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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_FLOORF], dnl Persuade glibc to declare floorf(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether floorf() is declared. - AC_CHECK_DECLS([floorf], , , [#include ]) + AC_CHECK_DECLS([floorf], , , [[#include ]]) if test "$ac_cv_have_decl_floorf" = yes; then dnl Test whether floorf() can be used without libm. gl_FUNC_FLOORF_LIBS diff --git a/m4/floorl.m4 b/m4/floorl.m4 index f21285d24..5a20b8b8c 100644 --- a/m4/floorl.m4 +++ b/m4/floorl.m4 @@ -1,4 +1,4 @@ -# floorl.m4 serial 8 +# floorl.m4 serial 9 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, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_FLOORL], dnl Persuade glibc to declare floorl(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether floorl() is declared. - AC_CHECK_DECLS([floorl], , , [#include ]) + AC_CHECK_DECLS([floorl], , , [[#include ]]) if test "$ac_cv_have_decl_floorl" = yes; then dnl Test whether floorl() can be used without libm. gl_FUNC_FLOORL_LIBS diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 22ba35cf1..150fefe6b 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,4 +1,4 @@ -# Check for fnmatch - serial 7. +# Check for fnmatch - serial 8. # Copyright (C) 2000-2007, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -150,7 +150,7 @@ AC_DEFUN([gl_PREREQ_FNMATCH], [Define to a replacement function name for fnmatch().]) dnl Prerequisites of lib/fnmatch.c. AC_REQUIRE([AC_TYPE_MBSTATE_T]) - AC_CHECK_DECLS([isblank], [], [], [#include ]) + AC_CHECK_DECLS([isblank], [], [], [[#include ]]) AC_CHECK_FUNCS_ONCE([btowc isblank iswctype mbsrtowcs mempcpy wmemchr wmemcpy wmempcpy]) AC_CHECK_HEADERS_ONCE([wctype.h]) ]) diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index fe8d14f1e..962e6e8e3 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,4 +1,4 @@ -# getaddrinfo.m4 serial 28 +# getaddrinfo.m4 serial 29 dnl Copyright (C) 2004-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, @@ -146,7 +146,7 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ AC_CHECK_HEADERS_ONCE([netinet/in.h]) - AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, getnameinfo],,,[ + AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, getnameinfo],,,[[ /* sys/types.h is not needed according to POSIX, but the sys/socket.h in i386-unknown-freebsd4.10 and powerpc-apple-darwin5.5 required it. */ @@ -160,7 +160,7 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ #ifdef HAVE_WS2TCPIP_H #include #endif -]) +]]) if test $ac_cv_have_decl_getaddrinfo = no; then HAVE_DECL_GETADDRINFO=0 fi diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4 index 542e4cead..07b60a680 100644 --- a/m4/getdomainname.m4 +++ b/m4/getdomainname.m4 @@ -1,4 +1,4 @@ -# getdomainname.m4 serial 8 +# getdomainname.m4 serial 9 dnl Copyright (C) 2002-2003, 2008-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, @@ -45,15 +45,15 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], dnl - It's int getdomainname(char *, int) on MacOS X, FreeBSD, AIX, IRIX, dnl OSF/1. AC_CHECK_DECLS([getdomainname], , , - [#include - #ifdef HAVE_SYS_SOCKET_H - #include - #endif - #ifdef HAVE_NETDB_H - #include - #endif - #include - ]) + [[#include + #ifdef HAVE_SYS_SOCKET_H + #include + #endif + #ifdef HAVE_NETDB_H + #include + #endif + #include + ]]) AC_CACHE_CHECK([for getdomainname's second argument type], [gl_cv_decl_getdomainname_argtype2], [if test $ac_cv_have_decl_getdomainname; then diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4 index 76979c1c3..4d1530aa9 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,4 +1,4 @@ -# gethrxtime.m4 serial 10 +# gethrxtime.m4 serial 11 dnl Copyright (C) 2005-2006, 2008-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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_GETHRXTIME], AC_REQUIRE([gl_ARITHMETIC_HRTIME_T]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_XTIME]) - AC_CHECK_DECLS([gethrtime], [], [], [#include ]) + AC_CHECK_DECLS([gethrtime], [], [], [[#include ]]) LIB_GETHRXTIME= if test $ac_cv_have_decl_gethrtime = no \ || test $gl_cv_arithmetic_hrtime_t = no; then diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 64cee1ea8..13e55f683 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -1,4 +1,4 @@ -# getpass.m4 serial 13 +# getpass.m4 serial 14 dnl Copyright (C) 2002-2003, 2005-2006, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -45,10 +45,10 @@ AC_DEFUN([gl_PREREQ_GETPASS], [ AC_CHECK_HEADERS_ONCE([stdio_ext.h termios.h]) AC_CHECK_FUNCS_ONCE([__fsetlocking tcgetattr tcsetattr]) AC_CHECK_DECLS([__fsetlocking],,, - [#include - #if HAVE_STDIO_EXT_H - #include - #endif]) + [[#include + #if HAVE_STDIO_EXT_H + #include + #endif]]) AC_CHECK_DECLS_ONCE([fflush_unlocked]) AC_CHECK_DECLS_ONCE([flockfile]) AC_CHECK_DECLS_ONCE([fputs_unlocked]) diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 45be497be..a9a901e9c 100644 --- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,4 +1,4 @@ -# inet_ntop.m4 serial 15 +# inet_ntop.m4 serial 16 dnl Copyright (C) 2005-2006, 2008-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, @@ -30,11 +30,11 @@ AC_DEFUN([gl_FUNC_INET_NTOP], AC_CHECK_HEADERS_ONCE([netdb.h]) AC_CHECK_DECLS([inet_ntop],,, - [#include - #if HAVE_NETDB_H - # include - #endif - ]) + [[#include + #if HAVE_NETDB_H + # include + #endif + ]]) if test $ac_cv_have_decl_inet_ntop = no; then HAVE_DECL_INET_NTOP=0 AC_REQUIRE([AC_C_RESTRICT]) diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 9fc64df4e..309f0d3d5 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,4 +1,4 @@ -# inet_pton.m4 serial 13 +# inet_pton.m4 serial 14 dnl Copyright (C) 2006, 2008-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, @@ -30,11 +30,11 @@ AC_DEFUN([gl_FUNC_INET_PTON], AC_CHECK_HEADERS_ONCE([netdb.h]) AC_CHECK_DECLS([inet_pton],,, - [#include - #if HAVE_NETDB_H - # include - #endif - ]) + [[#include + #if HAVE_NETDB_H + # include + #endif + ]]) if test $ac_cv_have_decl_inet_pton = no; then HAVE_DECL_INET_PTON=0 AC_REQUIRE([AC_C_RESTRICT]) diff --git a/m4/isfinite.m4 b/m4/isfinite.m4 index 72dbcc645..44cfcd44c 100644 --- a/m4/isfinite.m4 +++ b/m4/isfinite.m4 @@ -1,4 +1,4 @@ -# isfinite.m4 serial 10 +# isfinite.m4 serial 11 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_ISFINITE], AC_REQUIRE([gl_MATH_H_DEFAULTS]) dnl Persuade glibc to declare isfinite. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_DECLS([isfinite], , , [#include ]) + AC_CHECK_DECLS([isfinite], , , [[#include ]]) if test "$ac_cv_have_decl_isfinite" = yes; then gl_CHECK_MATH_LIB([ISFINITE_LIBM], [x = isfinite (x) + isfinite ((float) x);]) diff --git a/m4/isinf.m4 b/m4/isinf.m4 index 145e37e66..d18f367da 100644 --- a/m4/isinf.m4 +++ b/m4/isinf.m4 @@ -1,4 +1,4 @@ -# isinf.m4 serial 5 +# isinf.m4 serial 6 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_ISINF], AC_REQUIRE([gl_MATH_H_DEFAULTS]) dnl Persuade glibc to declare isinf. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_DECLS([isinf], , , [#include ]) + AC_CHECK_DECLS([isinf], , , [[#include ]]) if test "$ac_cv_have_decl_isinf" = yes; then gl_CHECK_MATH_LIB([ISINF_LIBM], [x = isinf (x) + isinf ((float) x);]) if test "$ISINF_LIBM" != missing; then diff --git a/m4/logb.m4 b/m4/logb.m4 index 972d38f7c..7d57baf6a 100644 --- a/m4/logb.m4 +++ b/m4/logb.m4 @@ -1,4 +1,4 @@ -# logb.m4 serial 3 +# logb.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, @@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_LOGB], [ AC_REQUIRE([gl_MATH_H_DEFAULTS]) dnl Test whether logb() is declared. - AC_CHECK_DECLS([logb], , , [#include ]) + AC_CHECK_DECLS([logb], , , [[#include ]]) if test "$ac_cv_have_decl_logb" != yes; then HAVE_DECL_LOGB=0 fi diff --git a/m4/readutmp.m4 b/m4/readutmp.m4 index 81b22ed27..8774b2025 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,4 +1,4 @@ -# readutmp.m4 serial 18 +# readutmp.m4 serial 19 dnl Copyright (C) 2002-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, @@ -14,13 +14,13 @@ AC_DEFUN([gl_READUTMP], dnl Prerequisites of lib/readutmp.h and lib/readutmp.c. AC_REQUIRE([AC_C_INLINE]) AC_CHECK_FUNCS_ONCE([utmpname utmpxname]) - AC_CHECK_DECLS([getutent],,,[ + AC_CHECK_DECLS([getutent],,,[[ /* is a prerequisite of on FreeBSD 8.0, OpenBSD 4.6. */ #include #ifdef HAVE_UTMP_H # include #endif -]) +]]) utmp_includes="\ AC_INCLUDES_DEFAULT #ifdef HAVE_UTMPX_H diff --git a/m4/regex.m4 b/m4/regex.m4 index e48fab0e5..fa46253b4 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -# serial 59 +# serial 60 # Copyright (C) 1996-2001, 2003-2011 Free Software Foundation, Inc. # @@ -219,5 +219,5 @@ AC_DEFUN([gl_PREREQ_REGEX], AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_CHECK_HEADERS([libintl.h]) AC_CHECK_FUNCS_ONCE([isblank iswctype wcscoll]) - AC_CHECK_DECLS([isblank], [], [], [#include ]) + AC_CHECK_DECLS([isblank], [], [], [[#include ]]) ]) diff --git a/m4/round.m4 b/m4/round.m4 index 9f6691f41..e64208ed9 100644 --- a/m4/round.m4 +++ b/m4/round.m4 @@ -1,4 +1,4 @@ -# round.m4 serial 12 +# round.m4 serial 13 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, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_ROUND], AC_REQUIRE([gl_MATH_H_DEFAULTS]) dnl Persuade glibc to declare round(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_DECLS([round], , , [#include ]) + AC_CHECK_DECLS([round], , , [[#include ]]) if test "$ac_cv_have_decl_round" = yes; then gl_CHECK_MATH_LIB([ROUND_LIBM], [x = round (x);]) if test "$ROUND_LIBM" != missing; then diff --git a/m4/roundf.m4 b/m4/roundf.m4 index 9c21340ca..f8e7f3e21 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,4 +1,4 @@ -# roundf.m4 serial 13 +# roundf.m4 serial 14 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_ROUNDF], AC_REQUIRE([gl_MATH_H_DEFAULTS]) dnl Persuade glibc to declare roundf(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_DECLS([roundf], , , [#include ]) + AC_CHECK_DECLS([roundf], , , [[#include ]]) if test "$ac_cv_have_decl_roundf" = yes; then gl_CHECK_MATH_LIB([ROUNDF_LIBM], [x = roundf (x);]) if test "$ROUNDF_LIBM" != missing; then @@ -96,7 +96,7 @@ int main (int argc, char *argv[]) fi if test $HAVE_DECL_ROUNDF = 0 || test $REPLACE_ROUNDF = 1; then dnl Find libraries needed to link lib/roundf.c. - AC_CHECK_DECLS([ceilf, floorf], , , [#include ]) + AC_CHECK_DECLS([ceilf, floorf], , , [[#include ]]) if test "$ac_cv_have_decl_floorf" = yes \ && test "$ac_cv_have_decl_ceilf" = yes; then gl_FUNC_FLOORF_LIBS diff --git a/m4/roundl.m4 b/m4/roundl.m4 index 9d0d381c7..eece9d7cb 100644 --- a/m4/roundl.m4 +++ b/m4/roundl.m4 @@ -1,4 +1,4 @@ -# roundl.m4 serial 11 +# roundl.m4 serial 12 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, @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_ROUNDL], AC_REQUIRE([gl_MATH_H_DEFAULTS]) dnl Persuade glibc to declare roundl(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_DECLS([roundl], , , [#include ]) + AC_CHECK_DECLS([roundl], , , [[#include ]]) if test "$ac_cv_have_decl_roundl" = yes; then gl_CHECK_MATH_LIB([ROUNDL_LIBM], [x = roundl (x);]) if test "$ROUNDL_LIBM" = missing; then @@ -61,7 +61,7 @@ int main (int argc, char *argv[]) fi if test $HAVE_DECL_ROUNDL = 0 || test $REPLACE_ROUNDL = 1; then dnl Find libraries needed to link lib/roundl.c. - AC_CHECK_DECLS([ceill, floorl], , , [#include ]) + AC_CHECK_DECLS([ceill, floorl], , , [[#include ]]) if test "$ac_cv_have_decl_floorl" = yes \ && test "$ac_cv_have_decl_ceill" = yes; then gl_FUNC_FLOORL_LIBS diff --git a/m4/signbit.m4 b/m4/signbit.m4 index 696a9b6e1..bbeb1f48c 100644 --- a/m4/signbit.m4 +++ b/m4/signbit.m4 @@ -1,4 +1,4 @@ -# signbit.m4 serial 10 +# signbit.m4 serial 11 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, @@ -65,7 +65,7 @@ AC_DEFUN([gl_SIGNBIT], gl_LONG_DOUBLE_SIGN_LOCATION if test "$gl_cv_cc_float_signbit" = unknown; then dnl Test whether copysignf() is declared. - AC_CHECK_DECLS([copysignf], , , [#include ]) + AC_CHECK_DECLS([copysignf], , , [[#include ]]) if test "$ac_cv_have_decl_copysignf" = yes; then dnl Test whether copysignf() can be used without libm. AC_CACHE_CHECK([whether copysignf can be used without linking with libm], @@ -87,7 +87,7 @@ AC_DEFUN([gl_SIGNBIT], fi if test "$gl_cv_cc_double_signbit" = unknown; then dnl Test whether copysign() is declared. - AC_CHECK_DECLS([copysign], , , [#include ]) + AC_CHECK_DECLS([copysign], , , [[#include ]]) if test "$ac_cv_have_decl_copysign" = yes; then dnl Test whether copysign() can be used without libm. AC_CACHE_CHECK([whether copysign can be used without linking with libm], @@ -109,7 +109,7 @@ AC_DEFUN([gl_SIGNBIT], fi if test "$gl_cv_cc_long_double_signbit" = unknown; then dnl Test whether copysignl() is declared. - AC_CHECK_DECLS([copysignl], , , [#include ]) + AC_CHECK_DECLS([copysignl], , , [[#include ]]) if test "$ac_cv_have_decl_copysignl" = yes; then dnl Test whether copysignl() can be used without libm. AC_CACHE_CHECK([whether copysignl can be used without linking with libm], diff --git a/m4/sleep.m4 b/m4/sleep.m4 index 37f19a9e4..74362e49b 100644 --- a/m4/sleep.m4 +++ b/m4/sleep.m4 @@ -1,4 +1,4 @@ -# sleep.m4 serial 5 +# sleep.m4 serial 6 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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_SLEEP], dnl _sleep() in MSVCRT. It has a different signature than POSIX sleep(): dnl it takes the number of milliseconds as argument and returns void. dnl mingw does not declare this function. - AC_CHECK_DECLS([sleep], , , [#include ]) + AC_CHECK_DECLS([sleep], , , [[#include ]]) AC_CHECK_FUNCS_ONCE([sleep]) if test $ac_cv_have_decl_sleep != yes; then HAVE_SLEEP=0 diff --git a/m4/strsignal.m4 b/m4/strsignal.m4 index f5c70ef1c..9c9c4110b 100644 --- a/m4/strsignal.m4 +++ b/m4/strsignal.m4 @@ -1,4 +1,4 @@ -# strsignal.m4 serial 6 +# strsignal.m4 serial 7 dnl Copyright (C) 2008-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, @@ -54,5 +54,5 @@ AC_DEFUN([gl_FUNC_STRSIGNAL], # Prerequisites of lib/strsignal.c. AC_DEFUN([gl_PREREQ_STRSIGNAL], [ AC_REQUIRE([AC_DECL_SYS_SIGLIST]) - AC_CHECK_DECLS([_sys_siglist], [], [], [#include ]) + AC_CHECK_DECLS([_sys_siglist], [], [], [[#include ]]) ]) diff --git a/m4/trunc.m4 b/m4/trunc.m4 index 62311015b..e7a1af1eb 100644 --- a/m4/trunc.m4 +++ b/m4/trunc.m4 @@ -1,4 +1,4 @@ -# trunc.m4 serial 7 +# trunc.m4 serial 8 dnl Copyright (C) 2007, 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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_TRUNC], dnl Persuade glibc to declare trunc(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether trunc() is declared. - AC_CHECK_DECLS([trunc], , , [#include ]) + AC_CHECK_DECLS([trunc], , , [[#include ]]) if test "$ac_cv_have_decl_trunc" = yes; then dnl Test whether trunc() can be used without libm. TRUNC_LIBM=? diff --git a/m4/truncf.m4 b/m4/truncf.m4 index 67f8bb6b0..346f0c8bb 100644 --- a/m4/truncf.m4 +++ b/m4/truncf.m4 @@ -1,4 +1,4 @@ -# truncf.m4 serial 6 +# truncf.m4 serial 8 dnl Copyright (C) 2007, 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, @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_TRUNCF], dnl Persuade glibc to declare truncf(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether truncf() is declared. - AC_CHECK_DECLS([truncf], , , [#include ]) + AC_CHECK_DECLS([truncf], , , [[#include ]]) if test "$ac_cv_have_decl_truncf" = yes; then dnl Test whether truncf() can be used without libm. TRUNCF_LIBM=? diff --git a/m4/truncl.m4 b/m4/truncl.m4 index c594236af..e6110c33f 100644 --- a/m4/truncl.m4 +++ b/m4/truncl.m4 @@ -1,4 +1,4 @@ -# truncl.m4 serial 8 +# truncl.m4 serial 9 dnl Copyright (C) 2007-2008, 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, @@ -12,7 +12,7 @@ AC_DEFUN([gl_FUNC_TRUNCL], dnl Persuade glibc to declare truncl(). AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) dnl Test whether truncl() is declared. - AC_CHECK_DECLS([truncl], , , [#include ]) + AC_CHECK_DECLS([truncl], , , [[#include ]]) if test "$ac_cv_have_decl_truncl" = yes; then dnl Test whether truncl() can be used without libm. TRUNCL_LIBM=? diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 32ea985b3..749d708d9 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,4 +1,4 @@ -# vasnprintf.m4 serial 32 +# vasnprintf.m4 serial 33 dnl Copyright (C) 2002-2004, 2006-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, @@ -63,7 +63,7 @@ AC_DEFUN_ONCE([gl_PREREQ_VASNPRINTF], AC_CHECK_FUNCS([snprintf strnlen wcslen wcsnlen mbrtowc wcrtomb]) dnl Use the _snprintf function only if it is declared (because on NetBSD it dnl is defined as a weak alias of snprintf; we prefer to use the latter). - AC_CHECK_DECLS([_snprintf], , , [#include ]) + AC_CHECK_DECLS([_snprintf], , , [[#include ]]) dnl We can avoid a lot of code by assuming that snprintf's return value dnl conforms to ISO C99. So check that. AC_REQUIRE([gl_SNPRINTF_RETVAL_C99]) diff --git a/m4/wctob.m4 b/m4/wctob.m4 index 8175d00e3..85cc6201b 100644 --- a/m4/wctob.m4 +++ b/m4/wctob.m4 @@ -1,4 +1,4 @@ -# wctob.m4 serial 9 +# wctob.m4 serial 10 dnl Copyright (C) 2008-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, @@ -104,7 +104,7 @@ int main () if test $REPLACE_WCTOB = 0; then dnl IRIX 6.5 has the wctob() function but does not declare it. - AC_CHECK_DECLS([wctob], [], [], [ + AC_CHECK_DECLS([wctob], [], [], [[ /* Tru64 with Desktop Toolkit C has a bug: must be included before . BSD/OS 4.0.1 has a bug: , and must be included @@ -113,7 +113,7 @@ int main () #include #include #include -]) +]]) if test $ac_cv_have_decl_wctob != yes; then HAVE_DECL_WCTOB=0 fi diff --git a/m4/wcwidth.m4 b/m4/wcwidth.m4 index 8a97e3891..5d4081397 100644 --- a/m4/wcwidth.m4 +++ b/m4/wcwidth.m4 @@ -1,4 +1,4 @@ -# wcwidth.m4 serial 20 +# wcwidth.m4 serial 21 dnl Copyright (C) 2006-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, @@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], AC_CHECK_HEADERS_ONCE([wchar.h]) AC_CHECK_FUNCS_ONCE([wcwidth]) - AC_CHECK_DECLS([wcwidth], [], [], [ + AC_CHECK_DECLS([wcwidth], [], [], [[ /* AIX 3.2.5 declares wcwidth in . */ #include /* Tru64 with Desktop Toolkit C has a bug: must be included before @@ -29,7 +29,7 @@ AC_DEFUN([gl_FUNC_WCWIDTH], #include #include #include -]) +]]) if test $ac_cv_have_decl_wcwidth != yes; then HAVE_DECL_WCWIDTH=0 fi -- 2.11.0