From b6d1202a37101d586919b49c8d0531b5bb56d4a3 Mon Sep 17 00:00:00 2001 From: Bruno Haible Date: Tue, 15 Apr 2008 01:52:03 +0200 Subject: [PATCH] Fix underquoting of AC_LANG_PROGRAM arguments. --- ChangeLog | 24 ++++++++++++++++++++++++ m4/calloc.m4 | 6 +++--- m4/extensions.m4 | 6 +++--- m4/gethrxtime.m4 | 8 ++++---- m4/getopt.m4 | 6 +++--- m4/inttypes.m4 | 12 ++++++------ m4/math_h.m4 | 6 +++--- m4/mbstate_t.m4 | 10 +++++----- m4/memmem.m4 | 6 +++--- m4/netinet_in_h.m4 | 6 +++--- m4/physmem.m4 | 8 ++++---- m4/putenv.m4 | 8 ++++---- m4/regex.m4 | 6 +++--- m4/stdint.m4 | 6 +++--- m4/stdio_h.m4 | 10 +++++----- m4/strcasestr.m4 | 6 +++--- m4/strerror.m4 | 16 ++++++++-------- m4/strndup.m4 | 8 ++++---- m4/strstr.m4 | 6 +++--- m4/sys_select_h.m4 | 6 +++--- m4/sys_socket_h.m4 | 4 ++-- 21 files changed, 99 insertions(+), 75 deletions(-) diff --git a/ChangeLog b/ChangeLog index 6d6fd8d85..e8b2c4de4 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,27 @@ +2008-04-14 Bruno Haible + + * m4/calloc.m4 (_AC_FUNC_CALLOC_IF): Fix underquoting of + AC_LANG_PROGRAM argument. + * m4/extensions.m4 (AC_USE_SYSTEM_EXTENSIONS): Likewise. + * m4/gethrxtime.m4 (gl_ARITHMETIC_HRTIME_T): Likewise. + * m4/getopt.m4 (gl_GETOPT_CHECK_HEADERS): Likewise. + * m4/inttypes.m4 (gl_INTTYPES_H): Likewise. + * m4/math_h.m4 (gl_MATH_H): Likewise. + * m4/mbstate_t.m4 (AC_TYPE_MBSTATE_T): Likewise. + * m4/memmem.m4 (gl_FUNC_MEMMEM): Likewise. + * m4/netinet_in_h.m4 (gl_HEADER_NETINET_IN): Likewise. + * m4/physmem.m4 (gl_SYS__SYSTEM_CONFIGURATION): Likewise. + * m4/putenv.m4 (gl_FUNC_PUTENV): Likewise. + * m4/regex.m4 (gl_REGEX): Likewise. + * m4/stdint.m4 (gl_INTEGER_TYPE_SUFFIX): Likewise. + * m4/stdio_h.m4 (gl_STDIN_LARGE_OFFSET): Likewise. + * m4/strcasestr.m4 (gl_FUNC_STRCASESTR): Likewise. + * m4/strerror.m4 (gl_FUNC_STRERROR_SEPARATE): Likewise. + * m4/strndup.m4 (gl_FUNC_STRNDUP): Likewise. + * m4/strstr.m4 (gl_FUNC_STRSTR): Likewise. + * m4/sys_select_h.m4 (gl_HEADER_SYS_SELECT): Likewise. + * m4/sys_socket_h.m4 (gl_HEADER_SYS_SOCKET): Likewise. + 2008-04-14 Jim Meyering test-strtod: fix typos: s/abs/fabs/ diff --git a/m4/calloc.m4 b/m4/calloc.m4 index 13972729d..b282067bb 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ -# calloc.m4 serial 7 +# calloc.m4 serial 8 -# Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2004-2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -19,7 +19,7 @@ AC_DEFUN([_AC_FUNC_CALLOC_IF], [AC_REQUIRE([AC_TYPE_SIZE_T])dnl AC_CACHE_CHECK([for GNU libc compatible calloc], ac_cv_func_calloc_0_nonnull, [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT], - [exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));])], + [[exit (!calloc (0, 0) || calloc ((size_t) -1 / 8 + 1, 8));]])], [ac_cv_func_calloc_0_nonnull=yes], [ac_cv_func_calloc_0_nonnull=no], [ac_cv_func_calloc_0_nonnull=no])]) diff --git a/m4/extensions.m4 b/m4/extensions.m4 index bcbb3ceee..917af9480 100644 --- a/m4/extensions.m4 +++ b/m4/extensions.m4 @@ -1,7 +1,7 @@ # serial 5 -*- Autoconf -*- # Enable extensions on systems that normally disable them. -# Copyright (C) 2003, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2006-2008 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. @@ -61,9 +61,9 @@ AC_BEFORE([$0], [AC_RUN_IFELSE])dnl AC_CACHE_CHECK([whether it is safe to define __EXTENSIONS__], [ac_cv_safe_to_define___extensions__], [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([ + [AC_LANG_PROGRAM([[ # define __EXTENSIONS__ 1 - AC_INCLUDES_DEFAULT])], + ]AC_INCLUDES_DEFAULT])], [ac_cv_safe_to_define___extensions__=yes], [ac_cv_safe_to_define___extensions__=no])]) test $ac_cv_safe_to_define___extensions__ = yes && diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4 index b596fec29..c33c07b33 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,5 +1,5 @@ -# gethrxtime.m4 serial 6 -dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# gethrxtime.m4 serial 7 +dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -28,8 +28,8 @@ AC_DEFUN([gl_ARITHMETIC_HRTIME_T], AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CACHE_CHECK([for arithmetic hrtime_t], gl_cv_arithmetic_hrtime_t, [AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include ], - [hrtime_t x = 0; return x/x;])], + [AC_LANG_PROGRAM([[#include ]], + [[hrtime_t x = 0; return x/x;]])], [gl_cv_arithmetic_hrtime_t=yes], [gl_cv_arithmetic_hrtime_t=no])]) if test $gl_cv_arithmetic_hrtime_t = yes; then diff --git a/m4/getopt.m4 b/m4/getopt.m4 index c0a73b2cb..9b683c2fe 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,5 +1,5 @@ -# getopt.m4 serial 13 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# getopt.m4 serial 14 +dnl Copyright (C) 2002-2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -46,7 +46,7 @@ AC_DEFUN([gl_GETOPT_CHECK_HEADERS], if test -z "$GETOPT_H"; then AC_CACHE_CHECK([for working GNU getopt function], [gl_cv_func_gnu_getopt], [AC_RUN_IFELSE( - [AC_LANG_PROGRAM([#include ], + [AC_LANG_PROGRAM([[#include ]], [[ char *myargv[3]; myargv[0] = "conftest"; diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index b17cbdaa4..d84ceadd5 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 11 -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# inttypes.m4 serial 12 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -32,7 +32,7 @@ AC_DEFUN([gl_INTTYPES_H], && test "$ac_cv_have_decl_strtoimax" = yes \ && test "$ac_cv_have_decl_strtoumax" = yes; then AC_COMPILE_IFELSE([ - AC_LANG_PROGRAM([ + AC_LANG_PROGRAM([[ #include #define __STDC_LIMIT_MACROS 1 /* to make it work also in C++ mode */ #define __STDC_CONSTANT_MACROS 1 /* to make it work also in C++ mode */ @@ -131,7 +131,7 @@ const char *l = /* implicit string concatenation */ SCNoPTR SCNuPTR SCNxPTR #endif ; - ])], + ]])], [gl_cv_header_working_inttypes_h=yes]) fi]) @@ -174,9 +174,9 @@ const char *l = /* implicit string concatenation */ I64) gltype1='__int64';; esac AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([#include + [AC_LANG_PROGRAM([[#include extern intptr_t foo; - extern $gltype1 foo;])], + extern $gltype1 foo;]])], [PRIPTR_PREFIX='"'$glpfx'"']) test -n "$PRIPTR_PREFIX" && break done diff --git a/m4/math_h.m4 b/m4/math_h.m4 index 8bb771166..902fdb57e 100644 --- a/m4/math_h.m4 +++ b/m4/math_h.m4 @@ -1,4 +1,4 @@ -# math_h.m4 serial 12 +# math_h.m4 serial 13 dnl Copyright (C) 2007-2008 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_MATH_H], AC_REQUIRE([gl_MATH_H_DEFAULTS]) gl_CHECK_NEXT_HEADERS([math.h]) AC_CACHE_CHECK([whether NAN macro works], [gl_cv_header_math_nan_works], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include ], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], [[/* Solaris 10 has a broken definition of NAN. Other platforms fail to provide NAN, or provide it only in C99 mode; this test only needs to fail when NAN is provided but wrong. */ @@ -24,7 +24,7 @@ AC_DEFUN([gl_MATH_H], REPLACE_NAN=1 fi AC_CACHE_CHECK([whether HUGE_VAL works], [gl_cv_header_math_huge_val_works], - [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include ], + [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[@%:@include ]], [[/* Solaris 10 has a broken definition of HUGE_VAL. */ double d = HUGE_VAL; return d == 0;]])], diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index df2a275c2..0da32b6b4 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ -# mbstate_t.m4 serial 9 -dnl Copyright (C) 2000, 2001, 2002 Free Software Foundation, Inc. +# mbstate_t.m4 serial 10 +dnl Copyright (C) 2000-2002, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -16,9 +16,9 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], [AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT -# include ], - [mbstate_t x; return sizeof x;])], + [AC_INCLUDES_DEFAULT[ +# include ]], + [[mbstate_t x; return sizeof x;]])], [ac_cv_type_mbstate_t=yes], [ac_cv_type_mbstate_t=no])]) if test $ac_cv_type_mbstate_t = yes; then diff --git a/m4/memmem.m4 b/m4/memmem.m4 index 7f3aa3c70..383ed4b30 100644 --- a/m4/memmem.m4 +++ b/m4/memmem.m4 @@ -1,4 +1,4 @@ -# memmem.m4 serial 9 +# memmem.m4 serial 10 dnl Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -26,11 +26,11 @@ AC_DEFUN([gl_FUNC_MEMMEM], if test $ac_cv_have_decl_memmem = yes; then AC_CACHE_CHECK([whether memmem works in linear time], [gl_cv_func_memmem_works], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([ + [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include /* for memmem */ #include /* for malloc */ #include /* for alarm */ -], [[size_t m = 1000000; +]], [[size_t m = 1000000; char *haystack = (char *) malloc (2 * m + 1); char *needle = (char *) malloc (m + 1); void *result = 0; diff --git a/m4/netinet_in_h.m4 b/m4/netinet_in_h.m4 index 096be740d..47fd9cc31 100644 --- a/m4/netinet_in_h.m4 +++ b/m4/netinet_in_h.m4 @@ -1,5 +1,5 @@ -# netinet_in_h.m4 serial 3 -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# netinet_in_h.m4 serial 4 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ AC_DEFUN([gl_HEADER_NETINET_IN], AC_CACHE_CHECK([whether is self-contained], [gl_cv_header_netinet_in_h_selfcontained], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[]])], [gl_cv_header_netinet_in_h_selfcontained=yes], [gl_cv_header_netinet_in_h_selfcontained=no]) ]) diff --git a/m4/physmem.m4 b/m4/physmem.m4 index 456bb3711..b5001e1fc 100644 --- a/m4/physmem.m4 +++ b/m4/physmem.m4 @@ -1,5 +1,5 @@ -# physmem.m4 serial 7 -dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# physmem.m4 serial 8 +dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -12,8 +12,8 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION], [AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include ]], - [double x = _system_configuration.physmem; - if (x > 0.0) return 0;])], + [[double x = _system_configuration.physmem; + if (x > 0.0) return 0;]])], [gl_cv_var__system_configuration=yes], [gl_cv_var__system_configuration=no])]) diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 9c76a006f..17105754c 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ -# putenv.m4 serial 14 -dnl Copyright (C) 2002-2007 Free Software Foundation, Inc. +# putenv.m4 serial 15 +dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -14,7 +14,7 @@ AC_DEFUN([gl_FUNC_PUTENV], AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_CACHE_CHECK([for putenv compatible with GNU and SVID], [gl_cv_func_svid_putenv], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[ + [AC_RUN_IFELSE([AC_LANG_PROGRAM([AC_INCLUDES_DEFAULT],[[ /* Put it in env. */ if (putenv ("CONFTEST_putenv=val")) return 1; @@ -28,7 +28,7 @@ AC_DEFUN([gl_FUNC_PUTENV], return 1; return 0; - ])], + ]])], gl_cv_func_svid_putenv=yes, gl_cv_func_svid_putenv=no, dnl When crosscompiling, assume putenv is broken. diff --git a/m4/regex.m4 b/m4/regex.m4 index af9815f25..38fb7ba39 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,4 +1,4 @@ -#serial 51 +#serial 52 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, # 2006, 2007, 2008 Free Software Foundation, Inc. @@ -37,13 +37,13 @@ AC_DEFUN([gl_REGEX], [gl_cv_func_re_compile_pattern_working], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [AC_INCLUDES_DEFAULT + [AC_INCLUDES_DEFAULT[ #if HAVE_LOCALE_H #include #endif #include #include - ], + ]], [[static struct re_pattern_buffer regex; unsigned char folded_chars[UCHAR_MAX + 1]; int i; diff --git a/m4/stdint.m4 b/m4/stdint.m4 index 9b5001a52..b25569256 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,4 +1,4 @@ -# stdint.m4 serial 30 +# stdint.m4 serial 31 dnl Copyright (C) 2001-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -337,9 +337,9 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], ui64)gltype1='unsigned __int64';; esac AC_COMPILE_IFELSE( - [AC_LANG_PROGRAM([$2 + [AC_LANG_PROGRAM([$2[ extern $gltype foo; - extern $gltype1 foo;])], + extern $gltype1 foo;]])], [eval gl_cv_type_${gltype}_suffix=\$glsuf]) eval result=\$gl_cv_type_${gltype}_suffix test "$result" != no && break diff --git a/m4/stdio_h.m4 b/m4/stdio_h.m4 index a40d41804..fa262e359 100644 --- a/m4/stdio_h.m4 +++ b/m4/stdio_h.m4 @@ -1,5 +1,5 @@ -# stdio_h.m4 serial 9 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# stdio_h.m4 serial 10 +dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -70,8 +70,8 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET], [ AC_CACHE_CHECK([whether stdin defaults to large file offsets], [gl_cv_var_stdin_large_offset], - [AC_LINK_IFELSE([AC_LANG_PROGRAM([#include ], -[#if defined __SL64 && defined __SCLE /* cygwin */ + [AC_LINK_IFELSE([AC_LANG_PROGRAM([[#include ]], +[[#if defined __SL64 && defined __SCLE /* cygwin */ /* Cygwin 1.5.24 and earlier fail to put stdin in 64-bit mode, making fseeko/ftello needlessly fail. This bug was fixed in 1.5.25, and it is easier to do a version check than building a runtime test. */ @@ -79,7 +79,7 @@ AC_DEFUN([gl_STDIN_LARGE_OFFSET], # if CYGWIN_VERSION_DLL_COMBINED < CYGWIN_VERSION_DLL_MAKE_COMBINED (1005, 25) choke me # endif -#endif])], +#endif]])], [gl_cv_var_stdin_large_offset=yes], [gl_cv_var_stdin_large_offset=no])]) ]) diff --git a/m4/strcasestr.m4 b/m4/strcasestr.m4 index a68917056..4f94375ee 100644 --- a/m4/strcasestr.m4 +++ b/m4/strcasestr.m4 @@ -1,4 +1,4 @@ -# strcasestr.m4 serial 8 +# strcasestr.m4 serial 9 dnl Copyright (C) 2005, 2007, 2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -25,11 +25,11 @@ AC_DEFUN([gl_FUNC_STRCASESTR], if test $ac_cv_func_strcasestr = yes; then AC_CACHE_CHECK([whether strcasestr works in linear time], [gl_cv_func_strcasestr_linear], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([ + [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include /* for memmem */ #include /* for malloc */ #include /* for alarm */ -], [[size_t m = 1000000; +]], [[size_t m = 1000000; char *haystack = (char *) malloc (2 * m + 2); char *needle = (char *) malloc (m + 2); void *result = 0; diff --git a/m4/strerror.m4 b/m4/strerror.m4 index eb7d45aab..75d54621b 100644 --- a/m4/strerror.m4 +++ b/m4/strerror.m4 @@ -1,5 +1,5 @@ -# strerror.m4 serial 7 -dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. +# strerror.m4 serial 8 +dnl Copyright (C) 2002, 2007-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -22,17 +22,17 @@ AC_DEFUN([gl_FUNC_STRERROR_SEPARATE], [gl_cv_func_working_strerror], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( - [#include - ], - [return !*strerror (-2);])], + [[#include + ]], + [[return !*strerror (-2);]])], [gl_cv_func_working_strerror=yes], [gl_cv_func_working_strerror=no], [dnl Assume crossbuild works if it compiles. AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( - [#include - ], - [return !*strerror (-2);])], + [[#include + ]], + [[return !*strerror (-2);]])], [gl_cv_func_working_strerror=yes], [gl_cv_func_working_strerror=no])])]) if test $gl_cv_func_working_strerror = no ; then diff --git a/m4/strndup.m4 b/m4/strndup.m4 index f7934ef82..1be2a85c5 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ -# strndup.m4 serial 14 -dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. +# strndup.m4 serial 15 +dnl Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -18,8 +18,8 @@ AC_DEFUN([gl_FUNC_STRNDUP], # AIX 4.3.3, AIX 5.1 have a function that fails to add the terminating '\0'. AC_CACHE_CHECK([for working strndup], gl_cv_func_strndup, [AC_RUN_IFELSE([ - AC_LANG_PROGRAM([#include - #include ], [[ + AC_LANG_PROGRAM([[#include + #include ]], [[ #ifndef HAVE_DECL_STRNDUP extern char *strndup (const char *, size_t); #endif diff --git a/m4/strstr.m4 b/m4/strstr.m4 index 9f08b7f00..5a49b07c2 100644 --- a/m4/strstr.m4 +++ b/m4/strstr.m4 @@ -1,4 +1,4 @@ -# strstr.m4 serial 1 +# strstr.m4 serial 2 dnl Copyright (C) 2008 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,11 +10,11 @@ AC_DEFUN([gl_FUNC_STRSTR], AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) AC_CACHE_CHECK([whether strstr works in linear time], [gl_cv_func_strstr_linear], - [AC_RUN_IFELSE([AC_LANG_PROGRAM([ + [AC_RUN_IFELSE([AC_LANG_PROGRAM([[ #include /* for memmem */ #include /* for malloc */ #include /* for alarm */ -], [[size_t m = 1000000; +]], [[size_t m = 1000000; char *haystack = (char *) malloc (2 * m + 2); char *needle = (char *) malloc (m + 2); void *result = 0; diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4 index 1d48bcc9b..8d1c36c12 100644 --- a/m4/sys_select_h.m4 +++ b/m4/sys_select_h.m4 @@ -1,5 +1,5 @@ -# sys_select_h.m4 serial 3 -dnl Copyright (C) 2006-2007 Free Software Foundation, Inc. +# sys_select_h.m4 serial 4 +dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, dnl with or without modifications, as long as this notice is preserved. @@ -9,7 +9,7 @@ AC_DEFUN([gl_HEADER_SYS_SELECT], AC_CACHE_CHECK([whether is self-contained], [gl_cv_header_sys_select_h_selfcontained], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[]])], [gl_cv_header_sys_select_h_selfcontained=yes], [gl_cv_header_sys_select_h_selfcontained=no]) ]) diff --git a/m4/sys_socket_h.m4 b/m4/sys_socket_h.m4 index 887cff80e..0e735a93c 100644 --- a/m4/sys_socket_h.m4 +++ b/m4/sys_socket_h.m4 @@ -1,4 +1,4 @@ -# sys_socket_h.m4 serial 5 +# sys_socket_h.m4 serial 6 dnl Copyright (C) 2005-2008 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_HEADER_SYS_SOCKET], AC_CACHE_CHECK([whether is self-contained], [gl_cv_header_sys_socket_h_selfcontained], [ - AC_COMPILE_IFELSE([AC_LANG_PROGRAM([#include ], [])], + AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[#include ]], [[]])], [gl_cv_header_sys_socket_h_selfcontained=yes], [gl_cv_header_sys_socket_h_selfcontained=no]) ]) -- 2.11.0