diff options
| author | Jim Meyering <meyering@redhat.com> | 2009-01-13 08:48:48 +0100 |
|---|---|---|
| committer | Jim Meyering <meyering@redhat.com> | 2009-01-14 11:24:37 +0100 |
| commit | 42d1eda5dcce2d68deab7a642e7f29bcd7144a0d (patch) | |
| tree | b98321c6a2033a0906b3f1244890450465d321e2 /m4 | |
| parent | 951fba5cd13092b41e4085878ffeee1145cb572d (diff) | |
| download | gnulib-42d1eda5dcce2d68deab7a642e7f29bcd7144a0d.tar.gz | |
many *.m4 files: improve m4 quoting
99% of this change was performed by running the following commands:
git ls-files | grep '\.m4$' | xargs perl -pi \
-e 's/(AC_\w+\()([^[()]+?)([,)])/$1\[$2]$3/g;' \
-e 's/(AC_\w+\((?:\[[^,]+?\], ){1})([^,[()]+?)([,)])/$1\[$2]$3/g;' \
-e 's/(AC_\w+\((?:\[[^,]+?\], ){2})([^,[()]+?)([,)])/$1\[$2]$3/g;' \
-e 's/(AC_\w+\((?:\[[^,]+?\], ){3})([^,[()]+?)([,)])/$1\[$2]$3/g'
perl -pi -e 's/\[\.\.\.\]/.../' m4/onceonly.m4
The remainder were to add Copyright dates, increment serial numbers,
undo some changes in comments, exclude m4/intl.m4, and add quotes
around the "1" in ",1" where the unusual spacing prohibited the
above regexps from doing the job. For more details, see
<http://thread.gmane.org/gmane.comp.lib.gnulib.bugs/16175>.
Diffstat (limited to 'm4')
218 files changed, 1008 insertions, 1021 deletions
@@ -1,7 +1,7 @@ # acl.m4 - check for access control list (ACL) primitives -# serial 8 +# serial 9 -# Copyright (C) 2002, 2004-2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2004-2009 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. @@ -52,7 +52,7 @@ int type = ACL_FIRST_ENTRY;]], [gl_cv_acl_ACL_FIRST_ENTRY=yes], [gl_cv_acl_ACL_FIRST_ENTRY=no])]) if test $gl_cv_acl_ACL_FIRST_ENTRY = yes; then - AC_DEFINE([HAVE_ACL_FIRST_ENTRY], 1, + AC_DEFINE([HAVE_ACL_FIRST_ENTRY], [1], [Define to 1 if the constant ACL_FIRST_ENTRY exists.]) fi dnl On MacOS X, other types of ACLs are supported. @@ -65,7 +65,7 @@ int type = ACL_TYPE_EXTENDED;]], [gl_cv_acl_ACL_TYPE_EXTENDED=yes], [gl_cv_acl_ACL_TYPE_EXTENDED=no])]) if test $gl_cv_acl_ACL_TYPE_EXTENDED = yes; then - AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], 1, + AC_DEFINE([HAVE_ACL_TYPE_EXTENDED], [1], [Define to 1 if the ACL type ACL_TYPE_EXTENDED exists.]) fi else @@ -133,7 +133,7 @@ int type = ACL_TYPE_EXTENDED;]], # but sets errno = ENOENT for an existing file or directory. AC_DEFUN([gl_ACL_GET_FILE], [ - AC_CACHE_CHECK([for working acl_get_file], gl_cv_func_working_acl_get_file, + AC_CACHE_CHECK([for working acl_get_file], [gl_cv_func_working_acl_get_file], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include <sys/types.h> @@ -1,17 +1,17 @@ -#serial 9 +# serial 10 -# Copyright (C) 1999, 2000, 2001, 2004, 2008 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2004, 2008-2009 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. AC_DEFUN([gl_AFS], [ - AC_ARG_WITH(afs, + AC_ARG_WITH([afs], AS_HELP_STRING([--with-afs], [support for the Andrew File System [[default=no]]]), test "$withval" = no || with_afs=yes, with_afs=no) if test "$with_afs" = yes; then - AC_DEFINE(AFS, 1, [Define if you have the Andrew File System.]) + AC_DEFINE([AFS], [1], [Define if you have the Andrew File System.]) fi ]) diff --git a/m4/alloca.m4 b/m4/alloca.m4 index 95f54a6d48..4b978e137c 100644 --- a/m4/alloca.m4 +++ b/m4/alloca.m4 @@ -1,5 +1,5 @@ -# alloca.m4 serial 8 -dnl Copyright (C) 2002-2004, 2006, 2007 Free Software Foundation, Inc. +# alloca.m4 serial 9 +dnl Copyright (C) 2002-2004, 2006, 2007, 2009 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. @@ -26,7 +26,7 @@ AC_DEFUN([gl_FUNC_ALLOCA], ]) if test $gl_cv_rpl_alloca = yes; then dnl OK, alloca can be implemented through a compiler built-in. - AC_DEFINE([HAVE_ALLOCA], 1, + AC_DEFINE([HAVE_ALLOCA], [1], [Define to 1 if you have 'alloca' after including <alloca.h>, a header that may be supplied by this distribution.]) ALLOCA_H=alloca.h diff --git a/m4/argp.m4 b/m4/argp.m4 index 80cb72f53e..7263a562eb 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,5 +1,5 @@ -# argp.m4 serial 8 -dnl Copyright (C) 2003-2007 Free Software Foundation, Inc. +# argp.m4 serial 9 +dnl Copyright (C) 2003-2007, 2009 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,18 +12,18 @@ AC_DEFUN([gl_ARGP], dnl argp-parse.c depends on GNU getopt internals, therefore use GNU getopt dnl always. gl_GETOPT_SUBSTITUTE - dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ(getopt), AC_LIBOBJ(getopt1). + dnl Note: gl_GETOPT_SUBSTITUTE does AC_LIBOBJ([getopt]), AC_LIBOBJ([getopt1]). AC_CHECK_DECL([program_invocation_name], - [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_NAME, 1, + [AC_DEFINE([HAVE_DECL_PROGRAM_INVOCATION_NAME], [1], [Define if program_invocation_name is declared])], - [AC_DEFINE(GNULIB_PROGRAM_INVOCATION_NAME, 1, + [AC_DEFINE([GNULIB_PROGRAM_INVOCATION_NAME], [1], [Define to 1 to add extern declaration of program_invocation_name to argp.h])], [#include <errno.h>]) AC_CHECK_DECL([program_invocation_short_name], - [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_SHORT_NAME, 1, + [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, + [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>]) @@ -31,21 +31,21 @@ AC_DEFUN([gl_ARGP], # are defined elsewhere. It is improbable that only one of them will # be defined and other not, I prefer to stay on the safe side and to # test each one separately. - AC_MSG_CHECKING(whether program_invocation_name is defined) + AC_MSG_CHECKING([whether program_invocation_name is defined]) AC_TRY_LINK([#include <argp.h>], [ program_invocation_name = "test"; ], - [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_NAME,1, + [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_NAME], [1], [Define if program_invocation_name is defined]) - AC_MSG_RESULT(yes)], - [ AC_MSG_RESULT(no)] ) + AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no])] ) - AC_MSG_CHECKING(whether program_invocation_short_name is defined) + AC_MSG_CHECKING([whether program_invocation_short_name is defined]) AC_TRY_LINK([#include <argp.h>], [ program_invocation_short_name = "test"; ], - [ AC_DEFINE(HAVE_PROGRAM_INVOCATION_SHORT_NAME,1, + [ AC_DEFINE([HAVE_PROGRAM_INVOCATION_SHORT_NAME], [1], [Define if program_invocation_short_name is defined]) - AC_MSG_RESULT(yes)], - [ AC_MSG_RESULT(no)] ) + AC_MSG_RESULT([yes])], + [ AC_MSG_RESULT([no])] ) AC_CHECK_DECLS_ONCE([clearerr_unlocked]) AC_CHECK_DECLS_ONCE([feof_unlocked]) diff --git a/m4/argz.m4 b/m4/argz.m4 index e9d790de3c..b77d48ab91 100644 --- a/m4/argz.m4 +++ b/m4/argz.m4 @@ -1,13 +1,13 @@ # Portability macros for glibc argz. -*- Autoconf -*- # -# Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2009 Free Software Foundation, Inc. # Written by Gary V. Vaughan <gary@gnu.org> # # 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. -# serial 6 argz.m4 +# serial 7 argz.m4 AC_DEFUN([gl_FUNC_ARGZ], [gl_PREREQ_ARGZ @@ -68,7 +68,7 @@ AS_IF([test -z "$ARGZ_H"], *) lt_cv_sys_argz_works=yes ;; esac]]) AS_IF([test $lt_cv_sys_argz_works = yes], - [AC_DEFINE([HAVE_WORKING_ARGZ], 1, + [AC_DEFINE([HAVE_WORKING_ARGZ], [1], [This value is set to 1 to indicate that the system argz facility works])], [ARGZ_H=argz.h AC_LIBOBJ([argz])])]) diff --git a/m4/atexit.m4 b/m4/atexit.m4 index 348912f9fa..2338c834e9 100644 --- a/m4/atexit.m4 +++ b/m4/atexit.m4 @@ -1,12 +1,12 @@ -# atexit.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# atexit.m4 serial 3 +dnl Copyright (C) 2002, 2009 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. AC_DEFUN([gl_FUNC_ATEXIT], [ - AC_REPLACE_FUNCS(atexit) + AC_REPLACE_FUNCS([atexit]) if test $ac_cv_func_atexit = no; then gl_PREREQ_ATEXIT fi diff --git a/m4/bison-i18n.m4 b/m4/bison-i18n.m4 index 75717127dc..032d082fa7 100644 --- a/m4/bison-i18n.m4 +++ b/m4/bison-i18n.m4 @@ -1,5 +1,5 @@ -# bison-i18n.m4 serial 2 -dnl Copyright (C) 2005-2006 Free Software Foundation, Inc. +# bison-i18n.m4 serial 3 +dnl Copyright (C) 2005-2006, 2009 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. @@ -42,7 +42,7 @@ AC_DEFUN([BISON_I18N], fi fi if test $BISON_USE_NLS = yes; then - AC_DEFINE([YYENABLE_NLS], 1, + AC_DEFINE([YYENABLE_NLS], [1], [Define to 1 to internationalize bison runtime messages.]) fi ]) diff --git a/m4/bison.m4 b/m4/bison.m4 index 91039b1ced..eb05c36eac 100644 --- a/m4/bison.m4 +++ b/m4/bison.m4 @@ -1,6 +1,6 @@ -#serial 4 +# serial 5 -# Copyright (C) 2002, 2005 Free Software Foundation, Inc. +# Copyright (C) 2002, 2005, 2009 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. @@ -14,10 +14,10 @@ dnl Declaring YACC & YFLAGS precious will not be necessary after GNULIB dnl requires an Autoconf greater than 2.59c, but it will probably still be dnl useful to override the description of YACC in the --help output, re dnl getdate.y assuming `bison -y'. - AC_ARG_VAR(YACC, + AC_ARG_VAR([YACC], [The `Yet Another C Compiler' implementation to use. Defaults to `bison -y'. Values other than `bison -y' will most likely break on most systems.])dnl - AC_ARG_VAR(YFLAGS, + AC_ARG_VAR([YFLAGS], [YFLAGS contains the list arguments that will be passed by default to Bison. This script will default YFLAGS to the empty string to avoid a default value of `-d' given by some make applications.])dnl diff --git a/m4/byteswap.m4 b/m4/byteswap.m4 index 642c42cf83..ad13f22867 100644 --- a/m4/byteswap.m4 +++ b/m4/byteswap.m4 @@ -1,5 +1,5 @@ -# byteswap.m4 serial 2 -dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc. +# byteswap.m4 serial 3 +dnl Copyright (C) 2005, 2007, 2009 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,5 +14,5 @@ AC_DEFUN([gl_BYTESWAP], ], [ BYTESWAP_H='byteswap.h' ]) - AC_SUBST(BYTESWAP_H) + AC_SUBST([BYTESWAP_H]) ]) diff --git a/m4/c-stack.m4 b/m4/c-stack.m4 index efd6798a82..0963cc580e 100644 --- a/m4/c-stack.m4 +++ b/m4/c-stack.m4 @@ -1,13 +1,13 @@ # Check prerequisites for compiling lib/c-stack.c. -# Copyright (C) 2002, 2003, 2004, 2008 Free Software Foundation, Inc. +# Copyright (C) 2002, 2003, 2004, 2008, 2009 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. # Written by Paul Eggert. -# serial 8 +# serial 9 AC_DEFUN([AC_SYS_XSI_STACK_OVERFLOW_HEURISTIC], [# for STACK_DIRECTION @@ -307,7 +307,7 @@ int main () [ac_cv_sys_xsi_stack_overflow_heuristic=cross-compiling])]) if test $ac_cv_sys_xsi_stack_overflow_heuristic = yes; then - AC_DEFINE(HAVE_XSI_STACK_OVERFLOW_HEURISTIC, 1, + AC_DEFINE([HAVE_XSI_STACK_OVERFLOW_HEURISTIC], [1], [Define to 1 if extending the stack slightly past the limit causes a SIGSEGV, and an alternate stack can be established with sigaltstack, and the signal handler is passed a context that specifies the diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4 index 7f206c71d1..0514f2d497 100644 --- a/m4/c-strtod.m4 +++ b/m4/c-strtod.m4 @@ -1,6 +1,6 @@ -# c-strtod.m4 serial 9 +# c-strtod.m4 serial 10 -# Copyright (C) 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2004, 2005, 2006, 2009 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. @@ -29,7 +29,7 @@ AC_DEFUN([gl_C99_STRTOLD], [gl_cv_func_c99_strtold=yes], [gl_cv_func_c99_strtold=no])]) if test $gl_cv_func_c99_strtold = yes; then - AC_DEFINE([HAVE_C99_STRTOLD], 1, [Define to 1 if strtold conforms to C99.]) + AC_DEFINE([HAVE_C99_STRTOLD], [1], [Define to 1 if strtold conforms to C99.]) fi ]) diff --git a/m4/calloc.m4 b/m4/calloc.m4 index b282067bbd..b0637b44ad 100644 --- a/m4/calloc.m4 +++ b/m4/calloc.m4 @@ -1,6 +1,6 @@ -# calloc.m4 serial 8 +# calloc.m4 serial 9 -# Copyright (C) 2004-2008 Free Software Foundation, Inc. +# Copyright (C) 2004-2009 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. @@ -12,12 +12,12 @@ # If so, define HAVE_CALLOC. Otherwise, define calloc to rpl_calloc # and arrange to use a calloc wrapper function that does work in that case. -# _AC_FUNC_CALLOC_IF(IF-WORKS, IF-NOT) +# _AC_FUNC_CALLOC_IF([IF-WORKS], [IF-NOT]) # ------------------------------------- # If `calloc (0, 0)' is properly handled, run IF-WORKS, otherwise, IF-NOT. 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_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));]])], [ac_cv_func_calloc_0_nonnull=yes], @@ -33,10 +33,10 @@ AS_IF([test $ac_cv_func_calloc_0_nonnull = yes], [$1], [$2]) # needed. AC_DEFUN([AC_FUNC_CALLOC], [_AC_FUNC_CALLOC_IF( - [AC_DEFINE([HAVE_CALLOC], 1, + [AC_DEFINE([HAVE_CALLOC], [1], [Define to 1 if your system has a GNU libc compatible `calloc' function, and to 0 otherwise.])], - [AC_DEFINE([HAVE_CALLOC], 0) + [AC_DEFINE([HAVE_CALLOC], [0]) AC_LIBOBJ([calloc]) AC_DEFINE([calloc], [rpl_calloc], [Define to rpl_calloc if the replacement function should be used.])]) @@ -52,7 +52,7 @@ AC_DEFUN([gl_FUNC_CALLOC_POSIX], AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix = yes; then HAVE_CALLOC_POSIX=1 - AC_DEFINE([HAVE_CALLOC_POSIX], 1, + AC_DEFINE([HAVE_CALLOC_POSIX], [1], [Define if the 'calloc' function is POSIX compliant.]) else AC_LIBOBJ([calloc]) diff --git a/m4/canonicalize-lgpl.m4 b/m4/canonicalize-lgpl.m4 index b0a79025c7..3a8ee2f957 100644 --- a/m4/canonicalize-lgpl.m4 +++ b/m4/canonicalize-lgpl.m4 @@ -1,5 +1,5 @@ -# canonicalize-lgpl.m4 serial 4 -dnl Copyright (C) 2003, 2006-2007 Free Software Foundation, Inc. +# canonicalize-lgpl.m4 serial 5 +dnl Copyright (C) 2003, 2006-2007, 2009 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. @@ -8,10 +8,10 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], [ dnl Do this replacement check manually because the file name is shorter dnl than the function name. - AC_CHECK_DECLS_ONCE(canonicalize_file_name) - AC_CHECK_FUNCS_ONCE(canonicalize_file_name) + AC_CHECK_DECLS_ONCE([canonicalize_file_name]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) if test $ac_cv_func_canonicalize_file_name = no; then - AC_LIBOBJ(canonicalize-lgpl) + AC_LIBOBJ([canonicalize-lgpl]) AC_DEFINE([realpath], [rpl_realpath], [Define to a replacement function name for realpath().]) gl_PREREQ_CANONICALIZE_LGPL @@ -22,14 +22,14 @@ AC_DEFUN([gl_CANONICALIZE_LGPL], # (no AC_LIBOBJ). AC_DEFUN([gl_CANONICALIZE_LGPL_SEPARATE], [ - AC_CHECK_DECLS_ONCE(canonicalize_file_name) - AC_CHECK_FUNCS_ONCE(canonicalize_file_name) + AC_CHECK_DECLS_ONCE([canonicalize_file_name]) + AC_CHECK_FUNCS_ONCE([canonicalize_file_name]) gl_PREREQ_CANONICALIZE_LGPL ]) # Prerequisites of lib/canonicalize-lgpl.c. AC_DEFUN([gl_PREREQ_CANONICALIZE_LGPL], [ - AC_CHECK_HEADERS_ONCE(sys/param.h unistd.h) - AC_CHECK_FUNCS_ONCE(getcwd readlink) + AC_CHECK_HEADERS_ONCE([sys/param.h unistd.h]) + AC_CHECK_FUNCS_ONCE([getcwd readlink]) ]) diff --git a/m4/chown.m4 b/m4/chown.m4 index 89761f5ff4..5d30ae3426 100644 --- a/m4/chown.m4 +++ b/m4/chown.m4 @@ -1,8 +1,8 @@ -#serial 17 +# serial 18 # Determine whether we need the chown wrapper. -dnl Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2007 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1997-2001, 2003-2005, 2007, 2009 +dnl Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_CHOWN], AC_REQUIRE([gl_FUNC_CHOWN_FOLLOWS_SYMLINK]) if test $ac_cv_func_chown_works = no; then - AC_DEFINE(CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE, 1, + AC_DEFINE([CHOWN_FAILS_TO_HONOR_ID_OF_NEGATIVE_ONE], [1], [Define if chown is not POSIX compliant regarding IDs of -1.]) fi @@ -31,7 +31,7 @@ AC_DEFUN([gl_FUNC_CHOWN], : # no wrapper needed else REPLACE_CHOWN=1 - AC_LIBOBJ(chown) + AC_LIBOBJ([chown]) gl_PREREQ_CHOWN fi ]) @@ -71,7 +71,7 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], ) if test $gl_cv_func_chown_follows_symlink = no; then - AC_DEFINE(CHOWN_MODIFIES_SYMLINK, 1, + AC_DEFINE([CHOWN_MODIFIES_SYMLINK], [1], [Define if chown modifies symlinks.]) fi ]) @@ -79,5 +79,5 @@ AC_DEFUN([gl_FUNC_CHOWN_FOLLOWS_SYMLINK], # Prerequisites of lib/chown.c. AC_DEFUN([gl_PREREQ_CHOWN], [ - AC_CHECK_FUNC([fchown], , [AC_LIBOBJ(fchown-stub)]) + AC_CHECK_FUNC([fchown], , [AC_LIBOBJ([fchown-stub])]) ]) diff --git a/m4/clock_time.m4 b/m4/clock_time.m4 index 227a5978e5..d191072f57 100644 --- a/m4/clock_time.m4 +++ b/m4/clock_time.m4 @@ -1,5 +1,5 @@ -# clock_time.m4 serial 8 -dnl Copyright (C) 2002-2006 Free Software Foundation, Inc. +# clock_time.m4 serial 9 +dnl Copyright (C) 2002-2006, 2009 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. @@ -21,10 +21,10 @@ AC_DEFUN([gl_CLOCK_TIME], # programs in the package would end up linked with that potentially-shared # library, inducing unnecessary run-time overhead. gl_saved_libs=$LIBS - AC_SEARCH_LIBS(clock_gettime, [rt posix4], + AC_SEARCH_LIBS([clock_gettime], [rt posix4], [test "$ac_cv_search_clock_gettime" = "none required" || LIB_CLOCK_GETTIME=$ac_cv_search_clock_gettime]) AC_SUBST([LIB_CLOCK_GETTIME]) - AC_CHECK_FUNCS(clock_gettime clock_settime) + AC_CHECK_FUNCS([clock_gettime clock_settime]) LIBS=$gl_saved_libs ]) diff --git a/m4/codeset.m4 b/m4/codeset.m4 index de4181d7d2..413217bd4a 100644 --- a/m4/codeset.m4 +++ b/m4/codeset.m4 @@ -1,5 +1,5 @@ -# codeset.m4 serial 3 (gettext-0.18) -dnl Copyright (C) 2000-2002, 2006, 2008 Free Software Foundation, Inc. +# codeset.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2006, 2008, 2009 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. @@ -15,7 +15,7 @@ AC_DEFUN([AM_LANGINFO_CODESET], [am_cv_langinfo_codeset=no]) ]) if test $am_cv_langinfo_codeset = yes; then - AC_DEFINE([HAVE_LANGINFO_CODESET], 1, + AC_DEFINE([HAVE_LANGINFO_CODESET], [1], [Define if you have <langinfo.h> and nl_langinfo(CODESET).]) fi ]) diff --git a/m4/copy-file.m4 b/m4/copy-file.m4 index 71a5b06042..957ba683e3 100644 --- a/m4/copy-file.m4 +++ b/m4/copy-file.m4 @@ -1,11 +1,11 @@ -# copy-file.m4 serial 2 -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# copy-file.m4 serial 3 +dnl Copyright (C) 2003, 2009 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. AC_DEFUN([gl_COPY_FILE], [ - AC_CHECK_HEADERS_ONCE(unistd.h utime.h) - AC_CHECK_FUNCS(chown utime utimes) + AC_CHECK_HEADERS_ONCE([unistd.h utime.h]) + AC_CHECK_FUNCS([chown utime utimes]) ]) diff --git a/m4/csharp.m4 b/m4/csharp.m4 index a9c548904f..4187d55d7f 100644 --- a/m4/csharp.m4 +++ b/m4/csharp.m4 @@ -1,5 +1,5 @@ -# csharp.m4 serial 2 (gettext-0.14.2) -dnl Copyright (C) 2004-2005 Free Software Foundation, Inc. +# csharp.m4 serial 3 (gettext-0.14.2) +dnl Copyright (C) 2004-2005, 2009 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,19 +9,19 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gt_CSHARP_CHOICE], [ AC_MSG_CHECKING([for preferred C[#] implementation]) - AC_ARG_ENABLE(csharp, + AC_ARG_ENABLE([csharp], [ --enable-csharp[[=IMPL]] choose preferred C[#] implementation (pnet or mono)], [CSHARP_CHOICE="$enableval"], CSHARP_CHOICE=any) - AC_SUBST(CSHARP_CHOICE) + AC_SUBST([CSHARP_CHOICE]) AC_MSG_RESULT([$CSHARP_CHOICE]) case "$CSHARP_CHOICE" in pnet) - AC_DEFINE([CSHARP_CHOICE_PNET], 1, + AC_DEFINE([CSHARP_CHOICE_PNET], [1], [Define if pnet is the preferred C# implementation.]) ;; mono) - AC_DEFINE([CSHARP_CHOICE_MONO], 1, + AC_DEFINE([CSHARP_CHOICE_MONO], [1], [Define if mono is the preferred C# implementation.]) ;; esac diff --git a/m4/csharpcomp.m4 b/m4/csharpcomp.m4 index 0cc28e7cb8..ebb1de4d02 100644 --- a/m4/csharpcomp.m4 +++ b/m4/csharpcomp.m4 @@ -1,5 +1,5 @@ -# csharpcomp.m4 serial 7 -dnl Copyright (C) 2003-2005, 2007 Free Software Foundation, Inc. +# csharpcomp.m4 serial 8 +dnl Copyright (C) 2003-2005, 2007, 2009 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. @@ -17,9 +17,9 @@ AC_DEFUN([gt_CSHARPCOMP], pushdef([AC_MSG_CHECKING],[:])dnl pushdef([AC_CHECKING],[:])dnl pushdef([AC_MSG_RESULT],[:])dnl - AC_CHECK_PROG(HAVE_CSCC_IN_PATH, cscc, yes) - AC_CHECK_PROG(HAVE_MCS_IN_PATH, mcs, yes) - AC_CHECK_PROG(HAVE_CSC_IN_PATH, csc, yes) + AC_CHECK_PROG([HAVE_CSCC_IN_PATH], [cscc], [yes]) + AC_CHECK_PROG([HAVE_MCS_IN_PATH], [mcs], [yes]) + AC_CHECK_PROG([HAVE_CSC_IN_PATH], [csc], [yes]) popdef([AC_MSG_RESULT])dnl popdef([AC_CHECKING])dnl popdef([AC_MSG_CHECKING])dnl @@ -67,12 +67,12 @@ AC_DEFUN([gt_CSHARPCOMP], esac done AC_MSG_RESULT([$ac_result]) - AC_SUBST(HAVE_CSCC) - AC_SUBST(HAVE_MCS) - AC_SUBST(HAVE_CSC) + AC_SUBST([HAVE_CSCC]) + AC_SUBST([HAVE_MCS]) + AC_SUBST([HAVE_CSC]) dnl Provide a default for CSHARPCOMPFLAGS. if test -z "${CSHARPCOMPFLAGS+set}"; then CSHARPCOMPFLAGS="-O -g" fi - AC_SUBST(CSHARPCOMPFLAGS) + AC_SUBST([CSHARPCOMPFLAGS]) ]) diff --git a/m4/csharpexec.m4 b/m4/csharpexec.m4 index fb254289bc..a1d850447d 100644 --- a/m4/csharpexec.m4 +++ b/m4/csharpexec.m4 @@ -1,5 +1,5 @@ -# csharpexec.m4 serial 3 (gettext-0.15) -dnl Copyright (C) 2003-2005 Free Software Foundation, Inc. +# csharpexec.m4 serial 4 (gettext-0.15) +dnl Copyright (C) 2003-2005, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gt_CSHARPEXEC], [ AC_REQUIRE([gt_CSHARP_CHOICE]) AC_MSG_CHECKING([for C[#] program execution engine]) - AC_EGREP_CPP(yes, [ + AC_EGREP_CPP([yes], [ #if defined _WIN32 || defined __WIN32__ || defined __EMX__ || defined __DJGPP__ yes #endif @@ -22,9 +22,9 @@ AC_DEFUN([gt_CSHARPEXEC], pushdef([AC_MSG_CHECKING],[:])dnl pushdef([AC_CHECKING],[:])dnl pushdef([AC_MSG_RESULT],[:])dnl - AC_CHECK_PROG(HAVE_ILRUN_IN_PATH, ilrun, yes) - AC_CHECK_PROG(HAVE_MONO_IN_PATH, mono, yes) - AC_CHECK_PROG(HAVE_CLIX_IN_PATH, clix, yes) + AC_CHECK_PROG([HAVE_ILRUN_IN_PATH], [ilrun], [yes]) + AC_CHECK_PROG([HAVE_MONO_IN_PATH], [mono], [yes]) + AC_CHECK_PROG([HAVE_CLIX_IN_PATH], [clix], [yes]) popdef([AC_MSG_RESULT])dnl popdef([AC_CHECKING])dnl popdef([AC_MSG_CHECKING])dnl @@ -76,11 +76,11 @@ AC_DEFUN([gt_CSHARPEXEC], esac done AC_MSG_RESULT([$ac_result]) - AC_SUBST(MONO_PATH) - AC_SUBST(MONO_PATH_SEPARATOR) - AC_SUBST(CLIX_PATH_VAR) - AC_SUBST(CLIX_PATH) - AC_SUBST(HAVE_ILRUN) - AC_SUBST(HAVE_MONO) - AC_SUBST(HAVE_CLIX) + AC_SUBST([MONO_PATH]) + AC_SUBST([MONO_PATH_SEPARATOR]) + AC_SUBST([CLIX_PATH_VAR]) + AC_SUBST([CLIX_PATH]) + AC_SUBST([HAVE_ILRUN]) + AC_SUBST([HAVE_MONO]) + AC_SUBST([HAVE_CLIX]) ]) diff --git a/m4/d-ino.m4 b/m4/d-ino.m4 index 6e6dab3d23..9bab8f1494 100644 --- a/m4/d-ino.m4 +++ b/m4/d-ino.m4 @@ -1,11 +1,11 @@ -#serial 10 +# serial 11 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_ino. dnl -# Copyright (C) 1997, 1999, 2000, 2001, 2003, 2004, 2006, 2007 Free Software +# Copyright (C) 1997, 1999-2001, 2003-2004, 2006-2007, 2009 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -34,7 +34,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO], [gl_cv_struct_dirent_d_ino=no], [gl_cv_struct_dirent_d_ino=no])]) if test $gl_cv_struct_dirent_d_ino = yes; then - AC_DEFINE(D_INO_IN_DIRENT, 1, + AC_DEFINE([D_INO_IN_DIRENT], [1], [Define if struct dirent has a member d_ino that actually works.]) fi ] diff --git a/m4/d-type.m4 b/m4/d-type.m4 index 92f9b15844..7e99f9c928 100644 --- a/m4/d-type.m4 +++ b/m4/d-type.m4 @@ -1,12 +1,11 @@ -#serial 9 +# serial 10 dnl From Jim Meyering. dnl dnl Check whether struct dirent has a member named d_type. dnl -# Copyright (C) 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 1997, 1999-2004, 2006, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -27,7 +26,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE], ] ) if test $gl_cv_struct_dirent_d_type = yes; then - AC_DEFINE(HAVE_STRUCT_DIRENT_D_TYPE, 1, + AC_DEFINE([HAVE_STRUCT_DIRENT_D_TYPE], [1], [Define if there is a member named d_type in the struct describing directory headers.]) fi diff --git a/m4/dirfd.m4 b/m4/dirfd.m4 index baab4dddad..5f845f5cda 100644 --- a/m4/dirfd.m4 +++ b/m4/dirfd.m4 @@ -1,9 +1,8 @@ -#serial 15 -*- Autoconf -*- +# serial 16 -*- Autoconf -*- dnl Find out how to get the file descriptor associated with an open DIR*. -# Copyright (C) 2001, 2002, 2003, 2004, 2005, 2006, 2008 Free Software -# Foundation, Inc. +# Copyright (C) 2001-2006, 2008-2009 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. @@ -22,7 +21,7 @@ AC_DEFUN([gl_FUNC_DIRFD], AC_REQUIRE([AC_PROG_CPP]) AC_REQUIRE([AC_PROG_EGREP]) - AC_CHECK_FUNCS(dirfd) + AC_CHECK_FUNCS([dirfd]) AC_CHECK_DECLS([dirfd], , , [#include <sys/types.h> #include <dirent.h>]) @@ -69,7 +68,7 @@ AC_DEFUN([gl_FUNC_DIRFD], ] ) if test $gl_cv_sys_dir_fd_member_name != no_such_member; then - AC_DEFINE_UNQUOTED(DIR_FD_MEMBER_NAME, + AC_DEFINE_UNQUOTED([DIR_FD_MEMBER_NAME], $gl_cv_sys_dir_fd_member_name, [the name of the file descriptor member of DIR]) fi diff --git a/m4/double-slash-root.m4 b/m4/double-slash-root.m4 index 23bf5b0cac..8c6841bc83 100644 --- a/m4/double-slash-root.m4 +++ b/m4/double-slash-root.m4 @@ -1,5 +1,5 @@ -# double-slash-root.m4 serial 3 -*- Autoconf -*- -dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# double-slash-root.m4 serial 4 -*- Autoconf -*- +dnl Copyright (C) 2006, 2008, 2009 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_DOUBLE_SLASH_ROOT], fi fi]) if test "$gl_cv_double_slash_root" = yes; then - AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], 1, + AC_DEFINE([DOUBLE_SLASH_IS_DISTINCT_ROOT], [1], [Define to 1 if // is a file system root distinct from /.]) fi ]) diff --git a/m4/eaccess.m4 b/m4/eaccess.m4 index 58dba2b26b..d9ceba323f 100644 --- a/m4/eaccess.m4 +++ b/m4/eaccess.m4 @@ -1,12 +1,12 @@ -# eaccess.m4 serial 1 (gettext-0.12) -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# eaccess.m4 serial 2 (gettext-0.12) +dnl Copyright (C) 2003, 2009 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. AC_DEFUN([gl_FUNC_EACCESS], [ - AC_CHECK_FUNC(eaccess, , - [AC_DEFINE(eaccess, access, + AC_CHECK_FUNC([eaccess], , + [AC_DEFINE([eaccess], [access], [Define as 'access' if you don't have the eaccess() function.])]) ]) diff --git a/m4/eealloc.m4 b/m4/eealloc.m4 index adcfd06c95..3c9c0b52a1 100644 --- a/m4/eealloc.m4 +++ b/m4/eealloc.m4 @@ -1,5 +1,5 @@ -# eealloc.m4 serial 1 -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# eealloc.m4 serial 2 +dnl Copyright (C) 2003, 2009 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,7 +16,7 @@ AC_DEFUN([gl_EEMALLOC], _AC_FUNC_MALLOC_IF( [gl_cv_func_malloc_0_nonnull=1], [gl_cv_func_malloc_0_nonnull=0]) - AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], $gl_cv_func_malloc_0_nonnull, + AC_DEFINE_UNQUOTED([MALLOC_0_IS_NONNULL], [$gl_cv_func_malloc_0_nonnull], [If malloc(0) is != NULL, define this to 1. Otherwise define this to 0.]) ]) @@ -26,7 +26,7 @@ AC_DEFUN([gl_EEREALLOC], _AC_FUNC_REALLOC_IF( [gl_cv_func_realloc_0_nonnull=1], [gl_cv_func_realloc_0_nonnull=0]) - AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], $gl_cv_func_realloc_0_nonnull, + AC_DEFINE_UNQUOTED([REALLOC_0_IS_NONNULL], [$gl_cv_func_realloc_0_nonnull], [If realloc(NULL,0) is != NULL, define this to 1. Otherwise define this to 0.]) ]) diff --git a/m4/environ.m4 b/m4/environ.m4 index fac0c05556..b17bb60a75 100644 --- a/m4/environ.m4 +++ b/m4/environ.m4 @@ -1,5 +1,5 @@ -# environ.m4 serial 1 -dnl Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc. +# environ.m4 serial 2 +dnl Copyright (C) 2001-2004, 2006-2009 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. @@ -21,13 +21,13 @@ AC_DEFUN([gt_CHECK_VAR_DECL], [ define([gt_cv_var], [gt_cv_var_]$2[_declaration]) AC_MSG_CHECKING([if $2 is properly declared]) - AC_CACHE_VAL(gt_cv_var, [ + AC_CACHE_VAL([gt_cv_var], [ AC_TRY_COMPILE([$1 extern struct { int foo; } $2;], [$2.foo = 1;], gt_cv_var=no, gt_cv_var=yes)]) - AC_MSG_RESULT($gt_cv_var) + AC_MSG_RESULT([$gt_cv_var]) if test $gt_cv_var = yes; then AC_DEFINE([HAVE_]translit($2, [a-z], [A-Z])[_DECL], 1, [Define if you have the declaration of $2.]) diff --git a/m4/errno_h.m4 b/m4/errno_h.m4 index 22c08f07fa..0682d1ab63 100644 --- a/m4/errno_h.m4 +++ b/m4/errno_h.m4 @@ -1,5 +1,5 @@ -# errno_h.m4 serial 2 -dnl Copyright (C) 2004, 2006, 2008 Free Software Foundation, Inc. +# errno_h.m4 serial 3 +dnl Copyright (C) 2004, 2006, 2008, 2009 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,8 +14,8 @@ AC_DEFUN([gl_HEADER_ERRNO_H], AC_DEFUN([gl_HEADER_ERRNO_H_BODY], [ AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([for complete errno.h], gl_cv_header_errno_h_complete, [ - AC_EGREP_CPP(booboo,[ + AC_CACHE_CHECK([for complete errno.h], [gl_cv_header_errno_h_complete], [ + AC_EGREP_CPP([booboo],[ #include <errno.h> #if !defined ENOMSG booboo @@ -70,7 +70,7 @@ AC_DEFUN([gl_REPLACE_ERRNO_VALUE], [ if test -n "$ERRNO_H"; then AC_CACHE_CHECK([for ]$1[ value], [gl_cv_header_errno_h_]$1, [ - AC_EGREP_CPP(yes,[ + AC_EGREP_CPP([yes],[ #include <errno.h> #ifdef ]$1[ yes @@ -79,7 +79,7 @@ yes [gl_cv_header_errno_h_]$1[=yes], [gl_cv_header_errno_h_]$1[=no]) if test $gl_cv_header_errno_h_]$1[ = no; then - AC_EGREP_CPP(yes,[ + AC_EGREP_CPP([yes],[ #define _XOPEN_SOURCE_EXTENDED 1 #include <errno.h> #ifdef ]$1[ diff --git a/m4/euidaccess.m4 b/m4/euidaccess.m4 index 6dd49c313f..5882f5817c 100644 --- a/m4/euidaccess.m4 +++ b/m4/euidaccess.m4 @@ -1,5 +1,5 @@ -# euidaccess.m4 serial 9 -dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. +# euidaccess.m4 serial 10 +dnl Copyright (C) 2002-2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_NONREENTRANT_EUIDACCESS], [ AC_REQUIRE([gl_FUNC_EUIDACCESS]) - AC_DEFINE([PREFER_NONREENTRANT_EUIDACCESS], 1, + AC_DEFINE([PREFER_NONREENTRANT_EUIDACCESS], [1], [Define this if you prefer euidaccess to return the correct result even if this would make it nonreentrant. Define this only if your entire application is safe even if the uid or gid might temporarily @@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_EUIDACCESS], dnl Persuade glibc <unistd.h> to declare euidaccess(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REPLACE_FUNCS(euidaccess) + AC_REPLACE_FUNCS([euidaccess]) if test $ac_cv_func_euidaccess = no; then HAVE_EUIDACCESS=0 gl_PREREQ_EUIDACCESS @@ -31,8 +31,8 @@ AC_DEFUN([gl_FUNC_EUIDACCESS], # Prerequisites of lib/euidaccess.c. AC_DEFUN([gl_PREREQ_EUIDACCESS], [ - AC_CHECK_HEADERS_ONCE(libgen.h) - AC_CHECK_DECLS_ONCE(setregid) + AC_CHECK_HEADERS_ONCE([libgen.h]) + AC_CHECK_DECLS_ONCE([setregid]) AC_REQUIRE([AC_FUNC_GETGROUPS]) # Solaris 9 needs -lgen to get the eaccess function. @@ -40,10 +40,10 @@ AC_DEFUN([gl_PREREQ_EUIDACCESS], [ # programs in the package would end up linked with that potentially-shared # library, inducing unnecessary run-time overhead. gl_saved_libs=$LIBS - AC_SEARCH_LIBS(eaccess, [gen], + AC_SEARCH_LIBS([eaccess], [gen], [test "$ac_cv_search_eaccess" = "none required" || LIB_EACCESS=$ac_cv_search_eaccess]) AC_SUBST([LIB_EACCESS]) - AC_CHECK_FUNCS(eaccess) + AC_CHECK_FUNCS([eaccess]) LIBS=$gl_saved_libs ]) diff --git a/m4/execute.m4 b/m4/execute.m4 index d376dc20ac..bec89461d2 100644 --- a/m4/execute.m4 +++ b/m4/execute.m4 @@ -1,5 +1,5 @@ -# execute.m4 serial 2 -dnl Copyright (C) 2003, 2008 Free Software Foundation, Inc. +# execute.m4 serial 3 +dnl Copyright (C) 2003, 2008, 2009 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,13 +9,13 @@ AC_DEFUN([gl_EXECUTE], dnl Prerequisites of lib/execute.c. AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MODE_T]) - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) AC_REQUIRE([AC_FUNC_FORK]) AC_CHECK_FUNC([posix_spawn], [gl_POSIX_SPAWN_WORKS case "$gl_cv_func_posix_spawn_works" in *yes) - AC_DEFINE([HAVE_POSIX_SPAWN], 1, + AC_DEFINE([HAVE_POSIX_SPAWN], [1], [Define if you have the posix_spawn() function and it works.]) ;; esac diff --git a/m4/fatal-signal.m4 b/m4/fatal-signal.m4 index bf44339e11..e8b9bf93fc 100644 --- a/m4/fatal-signal.m4 +++ b/m4/fatal-signal.m4 @@ -1,5 +1,5 @@ -# fatal-signal.m4 serial 6 -dnl Copyright (C) 2003-2004, 2006, 2008 Free Software Foundation, Inc. +# fatal-signal.m4 serial 7 +dnl Copyright (C) 2003-2004, 2006, 2008, 2009 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. @@ -7,6 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FATAL_SIGNAL], [ AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T]) - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) gl_PREREQ_SIG_HANDLER_H ]) diff --git a/m4/fchdir.m4 b/m4/fchdir.m4 index 1d3e5fe514..d5dd3e2d06 100644 --- a/m4/fchdir.m4 +++ b/m4/fchdir.m4 @@ -1,5 +1,5 @@ -# fchdir.m4 serial 6 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# fchdir.m4 serial 7 +dnl Copyright (C) 2006-2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_FCHDIR], REPLACE_FCHDIR=1 AC_LIBOBJ([fchdir]) gl_PREREQ_FCHDIR - AC_DEFINE([FCHDIR_REPLACEMENT], 1, + AC_DEFINE([FCHDIR_REPLACEMENT], [1], [Define if gnulib's fchdir() replacement is used.]) gl_REPLACE_OPEN gl_REPLACE_CLOSE diff --git a/m4/fcntl_h.m4 b/m4/fcntl_h.m4 index e3b9aa526c..4a7fc42b2b 100644 --- a/m4/fcntl_h.m4 +++ b/m4/fcntl_h.m4 @@ -1,5 +1,5 @@ # Configure fcntl.h. -dnl Copyright (C) 2006, 2007 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2007, 2009 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 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_FCNTL_H], [ AC_REQUIRE([gl_FCNTL_H_DEFAULTS]) - AC_CACHE_CHECK([for working fcntl.h], gl_cv_header_working_fcntl_h, + AC_CACHE_CHECK([for working fcntl.h], [gl_cv_header_working_fcntl_h], [AC_RUN_IFELSE( [AC_LANG_PROGRAM( [[#include <sys/types.h> diff --git a/m4/fileblocks.m4 b/m4/fileblocks.m4 index 5fb631112e..0a9c0a5d2d 100644 --- a/m4/fileblocks.m4 +++ b/m4/fileblocks.m4 @@ -1,5 +1,5 @@ -# fileblocks.m4 serial 4 -dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. +# fileblocks.m4 serial 5 +dnl Copyright (C) 2002, 2005, 2006, 2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FILEBLOCKS], [ AC_STRUCT_ST_BLOCKS - dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ(fileblocks). + dnl Note: AC_STRUCT_ST_BLOCKS does AC_LIBOBJ([fileblocks]). if test $ac_cv_member_struct_stat_st_blocks = no; then gl_PREREQ_FILEBLOCKS fi @@ -15,6 +15,6 @@ AC_DEFUN([gl_FILEBLOCKS], # Prerequisites of lib/fileblocks.c. AC_DEFUN([gl_PREREQ_FILEBLOCKS], [ - AC_CHECK_HEADERS_ONCE(sys/param.h) + AC_CHECK_HEADERS_ONCE([sys/param.h]) : ]) diff --git a/m4/filenamecat.m4 b/m4/filenamecat.m4 index bb46dbaf0d..77a3b6afac 100644 --- a/m4/filenamecat.m4 +++ b/m4/filenamecat.m4 @@ -1,5 +1,5 @@ -# filenamecat.m4 serial 8 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# filenamecat.m4 serial 9 +dnl Copyright (C) 2002-2006, 2009 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,5 +9,5 @@ AC_DEFUN([gl_FILE_NAME_CONCAT], AC_LIBOBJ([filenamecat]) dnl Prerequisites of lib/filenamecat.c. - AC_CHECK_FUNCS_ONCE(mempcpy) + AC_CHECK_FUNCS_ONCE([mempcpy]) ]) diff --git a/m4/findprog.m4 b/m4/findprog.m4 index 20658eeb31..a68ca07154 100644 --- a/m4/findprog.m4 +++ b/m4/findprog.m4 @@ -1,5 +1,5 @@ -# findprog.m4 serial 1 -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# findprog.m4 serial 2 +dnl Copyright (C) 2003, 2009 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. @@ -7,6 +7,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FINDPROG], [ dnl Prerequisites of lib/findprog.c. - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) AC_REQUIRE([gl_FUNC_EACCESS]) ]) diff --git a/m4/flexmember.m4 b/m4/flexmember.m4 index eb5f2b1790..271889b20f 100644 --- a/m4/flexmember.m4 +++ b/m4/flexmember.m4 @@ -1,7 +1,7 @@ -# serial 1 +# serial 2 # Check for flexible array member support. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009 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. @@ -36,6 +36,6 @@ AC_DEFUN([AC_C_FLEXIBLE_ARRAY_MEMBER], Don't use 'offsetof (struct s, d@<:@0@:>@)', as this doesn't work with MSVC and with C++ compilers.]) else - AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], 1) + AC_DEFINE([FLEXIBLE_ARRAY_MEMBER], [1]) fi ]) diff --git a/m4/fnmatch.m4 b/m4/fnmatch.m4 index 495cbf940e..47bb36b430 100644 --- a/m4/fnmatch.m4 +++ b/m4/fnmatch.m4 @@ -1,7 +1,6 @@ # Check for fnmatch - serial 2. -# Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2007, 2009 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. @@ -9,7 +8,7 @@ # Autoconf defines AC_FUNC_FNMATCH, but that is obsolescent. # New applications should use the macros below instead. -# _AC_FUNC_FNMATCH_IF(STANDARD = GNU | POSIX, CACHE_VAR, IF-TRUE, IF-FALSE) +# _AC_FUNC_FNMATCH_IF([STANDARD = GNU | POSIX], [CACHE_VAR], [IF-TRUE], [IF-FALSE]) # ------------------------------------------------------------------------- # If a STANDARD compliant fnmatch is found, run IF-TRUE, otherwise # IF-FALSE. Use CACHE_VAR. diff --git a/m4/fopen.m4 b/m4/fopen.m4 index 8f81a4a244..bc622685cd 100644 --- a/m4/fopen.m4 +++ b/m4/fopen.m4 @@ -1,5 +1,5 @@ -# fopen.m4 serial 3 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# fopen.m4 serial 4 +dnl Copyright (C) 2007-2009 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. @@ -39,7 +39,7 @@ changequote([,])dnl ]) case "$gl_cv_func_fopen_slash" in *no) - AC_DEFINE([FOPEN_TRAILING_SLASH_BUG], 1, + AC_DEFINE([FOPEN_TRAILING_SLASH_BUG], [1], [Define to 1 if fopen() fails to recognize a trailing slash.]) REPLACE_FOPEN=1 AC_LIBOBJ([fopen]) diff --git a/m4/fpending.m4 b/m4/fpending.m4 index 65d2dddf48..7860d70741 100644 --- a/m4/fpending.m4 +++ b/m4/fpending.m4 @@ -1,7 +1,6 @@ -#serial 13 +# serial 14 -# Copyright (C) 2000, 2001, 2004, 2005, 2006, 2007, 2008 Free Software -# Foundation, Inc. +# Copyright (C) 2000-2001, 2004-2009 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. @@ -16,7 +15,7 @@ dnl we have to grub around in the FILE struct. AC_DEFUN([gl_FUNC_FPENDING], [ - AC_CHECK_HEADERS_ONCE(stdio_ext.h) + AC_CHECK_HEADERS_ONCE([stdio_ext.h]) AC_CHECK_FUNCS_ONCE([__fpending]) fp_headers=' # include <stdio.h> @@ -78,7 +77,7 @@ AC_DEFUN([gl_FUNC_FPENDING], ac_cv_sys_pending_output_n_bytes=$ac_expr ] ) - AC_DEFINE_UNQUOTED(PENDING_OUTPUT_N_BYTES, + AC_DEFINE_UNQUOTED([PENDING_OUTPUT_N_BYTES], $ac_cv_sys_pending_output_n_bytes, [the number of pending output bytes on stream `fp']) AC_LIBOBJ([fpending]) diff --git a/m4/fprintf-posix.m4 b/m4/fprintf-posix.m4 index 4625caf6d8..323cef265f 100644 --- a/m4/fprintf-posix.m4 +++ b/m4/fprintf-posix.m4 @@ -1,5 +1,5 @@ -# fprintf-posix.m4 serial 12 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# fprintf-posix.m4 serial 13 +dnl Copyright (C) 2007-2009 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. @@ -96,7 +96,7 @@ AC_DEFUN([gl_REPLACE_FPRINTF], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_LIBOBJ([fprintf]) REPLACE_FPRINTF=1 - AC_DEFINE([REPLACE_FPRINTF_POSIX], 1, + AC_DEFINE([REPLACE_FPRINTF_POSIX], [1], [Define if fprintf is overridden by a POSIX compliant gnulib implementation.]) gl_PREREQ_FPRINTF ]) diff --git a/m4/free.m4 b/m4/free.m4 index 566734b775..05c3038dfc 100644 --- a/m4/free.m4 +++ b/m4/free.m4 @@ -1,6 +1,6 @@ # Check whether free (NULL) is supposed to work. -# Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +# Copyright (C) 2003, 2004, 2005, 2009 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. @@ -30,8 +30,8 @@ AC_DEFUN([gl_FUNC_FREE], [gl_cv_func_free=no])]) if test $gl_cv_func_free = no; then - AC_LIBOBJ(free) - AC_DEFINE(free, rpl_free, + AC_LIBOBJ([free]) + AC_DEFINE([free], [rpl_free], [Define to rpl_free if the replacement function should be used.]) fi ]) diff --git a/m4/frexp.m4 b/m4/frexp.m4 index 11ed05946b..6c9111212b 100644 --- a/m4/frexp.m4 +++ b/m4/frexp.m4 @@ -1,5 +1,5 @@ -# frexp.m4 serial 6 -dnl Copyright (C) 2007, 2008 Free Software Foundation, Inc. +# frexp.m4 serial 7 +dnl Copyright (C) 2007, 2008, 2009 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. @@ -48,7 +48,7 @@ AC_DEFUN([gl_FUNC_FREXP], gl_func_frexp=no fi if test $gl_func_frexp = yes; then - AC_DEFINE([HAVE_FREXP], 1, + AC_DEFINE([HAVE_FREXP], [1], [Define if the frexp() function is available and works.]) else AC_LIBOBJ([frexp]) @@ -80,7 +80,7 @@ AC_DEFUN([gl_FUNC_FREXP_NO_LIBM], REPLACE_FREXP=1 fi if test $gl_func_frexp_no_libm = yes; then - AC_DEFINE([HAVE_FREXP_IN_LIBC], 1, + AC_DEFINE([HAVE_FREXP_IN_LIBC], [1], [Define if the frexp() function is available in libc.]) else AC_LIBOBJ([frexp]) diff --git a/m4/frexpl.m4 b/m4/frexpl.m4 index c6bdff6c23..c5da7446c5 100644 --- a/m4/frexpl.m4 +++ b/m4/frexpl.m4 @@ -1,5 +1,5 @@ -# frexpl.m4 serial 8 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# frexpl.m4 serial 9 +dnl Copyright (C) 2007-2009 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. @@ -48,7 +48,7 @@ AC_DEFUN([gl_FUNC_FREXPL], gl_func_frexpl=no fi if test $gl_func_frexpl = yes; then - AC_DEFINE([HAVE_FREXPL], 1, + AC_DEFINE([HAVE_FREXPL], [1], [Define if the frexpl() function is available.]) dnl Also check whether it's declared. dnl MacOS X 10.3 has frexpl() in libc but doesn't declare it in <math.h>. @@ -84,7 +84,7 @@ AC_DEFUN([gl_FUNC_FREXPL_NO_LIBM], REPLACE_FREXPL=1 fi if test $gl_func_frexpl_no_libm = yes; then - AC_DEFINE([HAVE_FREXPL_IN_LIBC], 1, + AC_DEFINE([HAVE_FREXPL_IN_LIBC], [1], [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>. diff --git a/m4/fsusage.m4 b/m4/fsusage.m4 index c99d0ec8b6..8b8cbf72c7 100644 --- a/m4/fsusage.m4 +++ b/m4/fsusage.m4 @@ -1,7 +1,7 @@ -#serial 23 +# serial 24 # Obtaining file system usage information. -# Copyright (C) 1997, 1998, 2000, 2001, 2003-2008 Free Software Foundation, Inc. +# Copyright (C) 1997-1998, 2000-2001, 2003-2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,16 +11,16 @@ AC_DEFUN([gl_FSUSAGE], [ - AC_CHECK_HEADERS_ONCE(sys/param.h) - AC_CHECK_HEADERS_ONCE(sys/vfs.h sys/fs_types.h) - AC_CHECK_HEADERS(sys/mount.h, [], [], + AC_CHECK_HEADERS_ONCE([sys/param.h]) + AC_CHECK_HEADERS_ONCE([sys/vfs.h sys/fs_types.h]) + AC_CHECK_HEADERS([sys/mount.h], [], [], [AC_INCLUDES_DEFAULT [#if HAVE_SYS_PARAM_H #include <sys/param.h> #endif]]) gl_FILE_SYSTEM_USAGE([gl_cv_fs_space=yes], [gl_cv_fs_space=no]) if test $gl_cv_fs_space = yes; then - AC_LIBOBJ(fsusage) + AC_LIBOBJ([fsusage]) gl_PREREQ_FSUSAGE_EXTRA fi ]) @@ -38,14 +38,14 @@ AC_MSG_NOTICE([checking how to get file system space usage]) ac_fsusage_space=no # Perform only the link test since it seems there are no variants of the -# statvfs function. This check is more than just AC_CHECK_FUNCS(statvfs) +# statvfs function. This check is more than just AC_CHECK_FUNCS([statvfs]) # because that got a false positive on SCO OSR5. Adding the declaration # of a `struct statvfs' causes this test to fail (as it should) on such # systems. That system is reported to work fine with STAT_STATFS4 which # is what it gets when this test fails. if test $ac_fsusage_space = no; then # SVR4 - AC_CACHE_CHECK([for statvfs function (SVR4)], fu_cv_sys_stat_statvfs, + AC_CACHE_CHECK([for statvfs function (SVR4)], [fu_cv_sys_stat_statvfs], [AC_TRY_LINK([#include <sys/types.h> #if defined __GLIBC__ && defined __linux__ Do not use statvfs on systems with GNU libc on Linux, because that function @@ -65,7 +65,7 @@ a system call. fu_cv_sys_stat_statvfs=no)]) if test $fu_cv_sys_stat_statvfs = yes; then ac_fsusage_space=yes - AC_DEFINE(STAT_STATVFS, 1, + AC_DEFINE([STAT_STATVFS], [1], [ Define if there is a function named statvfs. (SVR4)]) fi fi @@ -73,7 +73,7 @@ fi if test $ac_fsusage_space = no; then # DEC Alpha running OSF/1 AC_MSG_CHECKING([for 3-argument statfs function (DEC OSF/1)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs3_osf1, + AC_CACHE_VAL([fu_cv_sys_stat_statfs3_osf1], [AC_TRY_RUN([ #include <sys/param.h> #include <sys/types.h> @@ -88,10 +88,10 @@ if test $ac_fsusage_space = no; then fu_cv_sys_stat_statfs3_osf1=yes, fu_cv_sys_stat_statfs3_osf1=no, fu_cv_sys_stat_statfs3_osf1=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs3_osf1) + AC_MSG_RESULT([$fu_cv_sys_stat_statfs3_osf1]) if test $fu_cv_sys_stat_statfs3_osf1 = yes; then ac_fsusage_space=yes - AC_DEFINE(STAT_STATFS3_OSF1, 1, + AC_DEFINE([STAT_STATFS3_OSF1], [1], [ Define if statfs takes 3 args. (DEC Alpha running OSF/1)]) fi fi @@ -100,7 +100,7 @@ if test $ac_fsusage_space = no; then # AIX AC_MSG_CHECKING([for two-argument statfs with statfs.bsize dnl member (AIX, 4.3BSD)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs2_bsize, + AC_CACHE_VAL([fu_cv_sys_stat_statfs2_bsize], [AC_TRY_RUN([ #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> @@ -121,10 +121,10 @@ member (AIX, 4.3BSD)]) fu_cv_sys_stat_statfs2_bsize=yes, fu_cv_sys_stat_statfs2_bsize=no, fu_cv_sys_stat_statfs2_bsize=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs2_bsize) + AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_bsize]) if test $fu_cv_sys_stat_statfs2_bsize = yes; then ac_fsusage_space=yes - AC_DEFINE(STAT_STATFS2_BSIZE, 1, + AC_DEFINE([STAT_STATFS2_BSIZE], [1], [ Define if statfs takes 2 args and struct statfs has a field named f_bsize. (4.3BSD, SunOS 4, HP-UX, AIX PS/2)]) fi @@ -133,7 +133,7 @@ fi if test $ac_fsusage_space = no; then # SVR3 AC_MSG_CHECKING([for four-argument statfs (AIX-3.2.5, SVR3)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs4, + AC_CACHE_VAL([fu_cv_sys_stat_statfs4], [AC_TRY_RUN([#include <sys/types.h> #include <sys/statfs.h> int @@ -145,10 +145,10 @@ if test $ac_fsusage_space = no; then fu_cv_sys_stat_statfs4=yes, fu_cv_sys_stat_statfs4=no, fu_cv_sys_stat_statfs4=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs4) + AC_MSG_RESULT([$fu_cv_sys_stat_statfs4]) if test $fu_cv_sys_stat_statfs4 = yes; then ac_fsusage_space=yes - AC_DEFINE(STAT_STATFS4, 1, + AC_DEFINE([STAT_STATFS4], [1], [ Define if statfs takes 4 args. (SVR3, Dynix, Irix, Dolphin)]) fi fi @@ -157,7 +157,7 @@ if test $ac_fsusage_space = no; then # 4.4BSD and NetBSD AC_MSG_CHECKING([for two-argument statfs with statfs.fsize dnl member (4.4BSD and NetBSD)]) - AC_CACHE_VAL(fu_cv_sys_stat_statfs2_fsize, + AC_CACHE_VAL([fu_cv_sys_stat_statfs2_fsize], [AC_TRY_RUN([#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> @@ -175,10 +175,10 @@ member (4.4BSD and NetBSD)]) fu_cv_sys_stat_statfs2_fsize=yes, fu_cv_sys_stat_statfs2_fsize=no, fu_cv_sys_stat_statfs2_fsize=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_statfs2_fsize) + AC_MSG_RESULT([$fu_cv_sys_stat_statfs2_fsize]) if test $fu_cv_sys_stat_statfs2_fsize = yes; then ac_fsusage_space=yes - AC_DEFINE(STAT_STATFS2_FSIZE, 1, + AC_DEFINE([STAT_STATFS2_FSIZE], [1], [ Define if statfs takes 2 args and struct statfs has a field named f_fsize. (4.4BSD, NetBSD)]) fi @@ -187,7 +187,7 @@ fi if test $ac_fsusage_space = no; then # Ultrix AC_MSG_CHECKING([for two-argument statfs with struct fs_data (Ultrix)]) - AC_CACHE_VAL(fu_cv_sys_stat_fs_data, + AC_CACHE_VAL([fu_cv_sys_stat_fs_data], [AC_TRY_RUN([#include <sys/types.h> #ifdef HAVE_SYS_PARAM_H #include <sys/param.h> @@ -209,10 +209,10 @@ if test $ac_fsusage_space = no; then fu_cv_sys_stat_fs_data=yes, fu_cv_sys_stat_fs_data=no, fu_cv_sys_stat_fs_data=no)]) - AC_MSG_RESULT($fu_cv_sys_stat_fs_data) + AC_MSG_RESULT([$fu_cv_sys_stat_fs_data]) if test $fu_cv_sys_stat_fs_data = yes; then ac_fsusage_space=yes - AC_DEFINE(STAT_STATFS2_FS_DATA, 1, + AC_DEFINE([STAT_STATFS2_FS_DATA], [1], [ Define if statfs takes 2 args and the second argument has type struct fs_data. (Ultrix)]) fi @@ -222,7 +222,7 @@ if test $ac_fsusage_space = no; then # SVR2 AC_TRY_CPP([#include <sys/filsys.h> ], - AC_DEFINE(STAT_READ_FILSYS, 1, + AC_DEFINE([STAT_READ_FILSYS], [1], [Define if there is no specific function for reading file systems usage information and you have the <sys/filsys.h> header file. (SVR2)]) ac_fsusage_space=yes) @@ -239,7 +239,7 @@ AS_IF([test $ac_fsusage_space = yes], [$1], [$2]) AC_DEFUN([gl_STATFS_TRUNCATES], [ AC_MSG_CHECKING([for statfs that truncates block counts]) - AC_CACHE_VAL(fu_cv_sys_truncating_statfs, + AC_CACHE_VAL([fu_cv_sys_truncating_statfs], [AC_COMPILE_IFELSE([AC_LANG_PROGRAM([[ #if !defined(sun) && !defined(__sun) choke -- this is a workaround for a Sun-specific problem @@ -251,19 +251,19 @@ choke -- this is a workaround for a Sun-specific problem [fu_cv_sys_truncating_statfs=yes], [fu_cv_sys_truncating_statfs=no])]) if test $fu_cv_sys_truncating_statfs = yes; then - AC_DEFINE(STATFS_TRUNCATES_BLOCK_COUNTS, 1, + AC_DEFINE([STATFS_TRUNCATES_BLOCK_COUNTS], [1], [Define if the block counts reported by statfs may be truncated to 2GB and the correct values may be stored in the f_spare array. (SunOS 4.1.2, 4.1.3, and 4.1.3_U1 are reported to have this problem. SunOS 4.1.1 seems not to be affected.)]) fi - AC_MSG_RESULT($fu_cv_sys_truncating_statfs) + AC_MSG_RESULT([$fu_cv_sys_truncating_statfs]) ]) # Prerequisites of lib/fsusage.c not done by gl_FILE_SYSTEM_USAGE. AC_DEFUN([gl_PREREQ_FSUSAGE_EXTRA], [ - AC_CHECK_HEADERS(dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h) + AC_CHECK_HEADERS([dustat.h sys/fs/s5param.h sys/filsys.h sys/statfs.h]) gl_STATFS_TRUNCATES ]) diff --git a/m4/ftruncate.m4 b/m4/ftruncate.m4 index b7f346a4ab..e43c15f2a5 100644 --- a/m4/ftruncate.m4 +++ b/m4/ftruncate.m4 @@ -1,8 +1,8 @@ -#serial 13 +# serial 14 # See if we need to emulate a missing ftruncate function using fcntl or chsize. -# Copyright (C) 2000, 2001, 2003-2007 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2003-2007, 2009 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. @@ -42,5 +42,5 @@ AC_DEFUN([gl_FUNC_FTRUNCATE], # Prerequisites of lib/ftruncate.c. AC_DEFUN([gl_PREREQ_FTRUNCATE], [ - AC_CHECK_FUNCS(chsize) + AC_CHECK_FUNCS([chsize]) ]) diff --git a/m4/gc-camellia.m4 b/m4/gc-camellia.m4 index c1fb02fe6c..fce57878f4 100644 --- a/m4/gc-camellia.m4 +++ b/m4/gc-camellia.m4 @@ -1,5 +1,5 @@ -# gc-camellia.m4 serial 1 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# gc-camellia.m4 serial 2 +dnl Copyright (C) 2007, 2009 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_GC_CAMELLIA], [gl_cv_libgcrypt_camellia=yes], [gl_cv_libgcrypt_camellia=no])]) if test "$gl_cv_libgcrypt_camellia" = yes; then - AC_DEFINE(HAVE_CAMELLIA, 1, [Define if your libgcrypt supports Camellia.]) + AC_DEFINE([HAVE_CAMELLIA], [1], [Define if your libgcrypt supports Camellia.]) fi fi ]) diff --git a/m4/gc-random.m4 b/m4/gc-random.m4 index c66e071314..3bbfdafab1 100644 --- a/m4/gc-random.m4 +++ b/m4/gc-random.m4 @@ -1,5 +1,5 @@ -# gc-random.m4 serial 3 -dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. +# gc-random.m4 serial 4 +dnl Copyright (C) 2005-2009 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. @@ -38,37 +38,37 @@ AC_DEFUN([gl_GC_RANDOM], esac AC_MSG_CHECKING([device with (strong) random data...]) - AC_ARG_ENABLE(random-device, + AC_ARG_ENABLE([random-device], AS_HELP_STRING([--enable-random-device], [device with (strong) randomness (for Nettle)]), NAME_OF_RANDOM_DEVICE=$enableval) - AC_MSG_RESULT($NAME_OF_RANDOM_DEVICE) + AC_MSG_RESULT([$NAME_OF_RANDOM_DEVICE]) AC_MSG_CHECKING([device with pseudo random data...]) - AC_ARG_ENABLE(pseudo-random-device, + AC_ARG_ENABLE([pseudo-random-device], AS_HELP_STRING([--enable-pseudo-random-device], [device with pseudo randomness (for Nettle)]), NAME_OF_PSEUDO_RANDOM_DEVICE=$enableval) - AC_MSG_RESULT($NAME_OF_PSEUDO_RANDOM_DEVICE) + AC_MSG_RESULT([$NAME_OF_PSEUDO_RANDOM_DEVICE]) AC_MSG_CHECKING([device with unpredictable data for nonces...]) - AC_ARG_ENABLE(nonce-device, + AC_ARG_ENABLE([nonce-device], AS_HELP_STRING([--enable-nonce-device], [device with unpredictable nonces (for Nettle)]), NAME_OF_NONCE_DEVICE=$enableval) - AC_MSG_RESULT($NAME_OF_NONCE_DEVICE) + AC_MSG_RESULT([$NAME_OF_NONCE_DEVICE]) if test "$cross_compiling" != yes; then if test "$NAME_OF_RANDOM_DEVICE" != "no"; then - AC_CHECK_FILE($NAME_OF_RANDOM_DEVICE,, + AC_CHECK_FILE([$NAME_OF_RANDOM_DEVICE],, AC_MSG_WARN([[Device `$NAME_OF_RANDOM_DEVICE' does not exist, consider to use --enable-random-device]])) fi if test "$NAME_OF_PSEUDO_RANDOM_DEVICE" != "no"; then - AC_CHECK_FILE($NAME_OF_PSEUDO_RANDOM_DEVICE,, + AC_CHECK_FILE([$NAME_OF_PSEUDO_RANDOM_DEVICE],, AC_MSG_WARN([[Device `$NAME_OF_PSEUDO_RANDOM_DEVICE' does not exist, consider to use --enable-pseudo-random-device]])) fi if test "$NAME_OF_NONCE_DEVICE" != "no"; then - AC_CHECK_FILE($NAME_OF_NONCE_DEVICE,, + AC_CHECK_FILE([$NAME_OF_NONCE_DEVICE],, AC_MSG_WARN([[Device `$NAME_OF_NONCE_DEVICE' does not exist, consider to use --enable-nonce-device]])) fi else @@ -77,11 +77,11 @@ AC_DEFUN([gl_GC_RANDOM], # FIXME?: Open+read 42 bytes+close twice and compare data. Should differ. - AC_DEFINE_UNQUOTED(NAME_OF_RANDOM_DEVICE, "$NAME_OF_RANDOM_DEVICE", + AC_DEFINE_UNQUOTED([NAME_OF_RANDOM_DEVICE], ["$NAME_OF_RANDOM_DEVICE"], [defined to the name of the (strong) random device]) - AC_DEFINE_UNQUOTED(NAME_OF_PSEUDO_RANDOM_DEVICE, + AC_DEFINE_UNQUOTED([NAME_OF_PSEUDO_RANDOM_DEVICE], "$NAME_OF_PSEUDO_RANDOM_DEVICE", [defined to the name of the pseudo random device]) - AC_DEFINE_UNQUOTED(NAME_OF_NONCE_DEVICE, "$NAME_OF_NONCE_DEVICE", + AC_DEFINE_UNQUOTED([NAME_OF_NONCE_DEVICE], ["$NAME_OF_NONCE_DEVICE"], [defined to the name of the unpredictable nonce device]) ]) @@ -1,12 +1,12 @@ -# gc.m4 serial 4 -dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# gc.m4 serial 5 +dnl Copyright (C) 2005, 2006, 2009 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. AC_DEFUN([gl_GC], [ - AC_ARG_WITH(libgcrypt, + AC_ARG_WITH([libgcrypt], AS_HELP_STRING([--with-libgcrypt], [use libgcrypt for low-level crypto]), libgcrypt=$withval, libgcrypt=no) if test "$libgcrypt" != no; then diff --git a/m4/getaddrinfo.m4 b/m4/getaddrinfo.m4 index 9655a4289b..4088671987 100644 --- a/m4/getaddrinfo.m4 +++ b/m4/getaddrinfo.m4 @@ -1,5 +1,5 @@ -# getaddrinfo.m4 serial 19 -dnl Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +# getaddrinfo.m4 serial 20 +dnl Copyright (C) 2004-2009 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,7 +18,7 @@ AC_DEFUN([gl_GETADDRINFO], dnl - On BeOS, it is in libnet. dnl - On native Windows, it is in ws2_32.dll. dnl - Otherwise it is in libc. - AC_SEARCH_LIBS(getaddrinfo, [socket network net], + AC_SEARCH_LIBS([getaddrinfo], [socket network net], [if test "$ac_cv_search_getaddrinfo" != "none required"; then GETADDRINFO_LIB="$ac_cv_search_getaddrinfo" fi]) @@ -38,7 +38,7 @@ AC_DEFUN([gl_GETADDRINFO], [gl_cv_func_getaddrinfo=yes], [gl_cv_func_getaddrinfo=no])]) if test $gl_cv_func_getaddrinfo = no; then - AC_CACHE_CHECK(for getaddrinfo in ws2tcpip.h and -lws2_32, + AC_CACHE_CHECK([for getaddrinfo in ws2tcpip.h and -lws2_32], gl_cv_w32_getaddrinfo, [ gl_cv_w32_getaddrinfo=no am_save_LIBS="$LIBS" @@ -55,7 +55,7 @@ AC_DEFUN([gl_GETADDRINFO], GETADDRINFO_LIB="-lws2_32" LIBS="$gai_saved_LIBS $GETADDRINFO_LIB" else - AC_LIBOBJ(getaddrinfo) + AC_LIBOBJ([getaddrinfo]) fi fi @@ -80,7 +80,7 @@ AC_DEFUN([gl_GETADDRINFO], [gl_cv_func_gai_strerror=yes], [gl_cv_func_gai_strerror=no])]) if test $gl_cv_func_gai_strerror = no; then - AC_LIBOBJ(gai_strerror) + AC_LIBOBJ([gai_strerror]) fi LIBS="$gai_saved_LIBS" @@ -106,7 +106,7 @@ AC_DEFUN([gl_PREREQ_GETADDRINFO], [ dnl have sa_len so the result is correct anyway. AC_CHECK_MEMBERS([struct sockaddr.sa_len], , , [#include <sys/socket.h>]) - AC_CHECK_HEADERS_ONCE(netinet/in.h) + AC_CHECK_HEADERS_ONCE([netinet/in.h]) AC_CHECK_DECLS([getaddrinfo, freeaddrinfo, gai_strerror, getnameinfo],,,[ /* sys/types.h is not needed according to POSIX, but the diff --git a/m4/getcwd-abort-bug.m4 b/m4/getcwd-abort-bug.m4 index a431a7ccc0..07e2c18cc5 100644 --- a/m4/getcwd-abort-bug.m4 +++ b/m4/getcwd-abort-bug.m4 @@ -1,9 +1,9 @@ -#serial 1 +# serial 2 # Determine whether getcwd aborts when the length of the working directory # name is unusually large. Any length between 4k and 16k trigger the bug # when using glibc-2.4.90-9 or older. -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009 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. @@ -13,8 +13,8 @@ # gl_FUNC_GETCWD_ABORT_BUG([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN([gl_FUNC_GETCWD_ABORT_BUG], [ - AC_CHECK_DECLS_ONCE(getcwd) - AC_CHECK_FUNCS(getpagesize) + AC_CHECK_DECLS_ONCE([getcwd]) + AC_CHECK_FUNCS([getpagesize]) AC_CACHE_CHECK([whether getcwd aborts when 4k < cwd_length < 16k], gl_cv_func_getcwd_abort_bug, [# Remove any remnants of a previous test. diff --git a/m4/getcwd-path-max.m4 b/m4/getcwd-path-max.m4 index 5e6d58bdae..14784999d4 100644 --- a/m4/getcwd-path-max.m4 +++ b/m4/getcwd-path-max.m4 @@ -1,4 +1,4 @@ -#serial 13 +# serial 14 # Check for several getcwd bugs with long file names. # If so, arrange to compile the wrapper function. @@ -6,7 +6,7 @@ # I've heard that this is due to a Linux kernel bug, and that it has # been fixed between 2.4.21-pre3 and 2.4.21-pre4. */ -# Copyright (C) 2003, 2004, 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003-2007, 2009 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. @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX], [ - AC_CHECK_DECLS_ONCE(getcwd) + AC_CHECK_DECLS_ONCE([getcwd]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CACHE_CHECK([whether getcwd handles long file names properly], gl_cv_func_getcwd_path_max, @@ -181,7 +181,7 @@ main () ]) case $gl_cv_func_getcwd_path_max in no,*) - AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], 1, + AC_DEFINE([HAVE_PARTLY_WORKING_GETCWD], [1], [Define to 1 if getcwd works, except it sometimes fails when it shouldn't, setting errno to ERANGE, ENAMETOOLONG, or ENOENT. If __GETCWD_PREFIX is not defined, it doesn't matter whether HAVE_PARTLY_WORKING_GETCWD diff --git a/m4/getdate.m4 b/m4/getdate.m4 index c335243e99..67f9c6566d 100644 --- a/m4/getdate.m4 +++ b/m4/getdate.m4 @@ -1,5 +1,5 @@ -# getdate.m4 serial 13 -dnl Copyright (C) 2002-2006, 2008 Free Software Foundation, Inc. +# getdate.m4 serial 14 +dnl Copyright (C) 2002-2006, 2008, 2009 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,14 +12,14 @@ dnl expressions and therefore cannot be used as initializer for global or dnl static variables (even though gcc supports this in pre-C99 mode). AC_DEFUN([gl_C_COMPOUND_LITERALS], [ - AC_CACHE_CHECK([for compound literals], gl_cv_compound_literals, + AC_CACHE_CHECK([for compound literals], [gl_cv_compound_literals], [AC_TRY_COMPILE([struct s { int i, j; };], [struct s t = (struct s) { 3, 4 }; if (t.i != 0) return 0;], gl_cv_compound_literals=yes, gl_cv_compound_literals=no)]) if test $gl_cv_compound_literals = yes; then - AC_DEFINE(HAVE_COMPOUND_LITERALS, 1, + AC_DEFINE([HAVE_COMPOUND_LITERALS], [1], [Define if you have compound literals.]) fi ]) diff --git a/m4/getdomainname.m4 b/m4/getdomainname.m4 index e9198a0b9e..94a8717ca0 100644 --- a/m4/getdomainname.m4 +++ b/m4/getdomainname.m4 @@ -1,5 +1,5 @@ -# getdomainname.m4 serial 3 -dnl Copyright (C) 2002-2003, 2008 Free Software Foundation, Inc. +# getdomainname.m4 serial 4 +dnl Copyright (C) 2002-2003, 2008, 2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_GETDOMAINNAME], dnl Persuade glibc <unistd.h> to declare getdomainname(). AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_REPLACE_FUNCS(getdomainname) + AC_REPLACE_FUNCS([getdomainname]) if test $ac_cv_func_getdomainname = no; then HAVE_GETDOMAINNAME=0 gl_PREREQ_GETDOMAINNAME diff --git a/m4/getgroups.m4 b/m4/getgroups.m4 index 0364752fcc..a7019fb66a 100644 --- a/m4/getgroups.m4 +++ b/m4/getgroups.m4 @@ -1,10 +1,9 @@ -#serial 11 +# serial 12 dnl From Jim Meyering. dnl A wrapper around AC_FUNC_GETGROUPS. -# Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2008 Free -# Software Foundation, Inc. +# Copyright (C) 1996-1997, 1999-2004, 2008-2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -14,8 +13,8 @@ AC_DEFUN([gl_FUNC_GETGROUPS], [ AC_REQUIRE([AC_FUNC_GETGROUPS]) if test "$ac_cv_func_getgroups_works" != yes; then - AC_LIBOBJ(getgroups) - AC_DEFINE(getgroups, rpl_getgroups, + AC_LIBOBJ([getgroups]) + AC_DEFINE([getgroups], [rpl_getgroups], [Define as rpl_getgroups if getgroups doesn't work right.]) gl_PREREQ_GETGROUPS fi diff --git a/m4/gethostname.m4 b/m4/gethostname.m4 index 217f9c17de..6b6fca95c2 100644 --- a/m4/gethostname.m4 +++ b/m4/gethostname.m4 @@ -1,5 +1,5 @@ -# gethostname.m4 serial 4 -dnl Copyright (C) 2002, 2008 Free Software Foundation, Inc. +# gethostname.m4 serial 5 +dnl Copyright (C) 2002, 2008, 2009 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. @@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) gl_PREREQ_SYS_H_WINSOCK2 - AC_REPLACE_FUNCS(gethostname) + AC_REPLACE_FUNCS([gethostname]) if test $ac_cv_func_gethostname = no; then HAVE_GETHOSTNAME=0 gl_PREREQ_GETHOSTNAME @@ -17,5 +17,5 @@ AC_DEFUN([gl_FUNC_GETHOSTNAME], # Prerequisites of lib/gethostname.c. AC_DEFUN([gl_PREREQ_GETHOSTNAME], [ - AC_CHECK_FUNCS(uname) + AC_CHECK_FUNCS([uname]) ]) diff --git a/m4/gethrxtime.m4 b/m4/gethrxtime.m4 index c33c07b331..d33ecacbe0 100644 --- a/m4/gethrxtime.m4 +++ b/m4/gethrxtime.m4 @@ -1,5 +1,5 @@ -# gethrxtime.m4 serial 7 -dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. +# gethrxtime.m4 serial 8 +dnl Copyright (C) 2005, 2006, 2008, 2009 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. @@ -26,14 +26,14 @@ AC_DEFUN([gl_GETHRXTIME], 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_CACHE_CHECK([for arithmetic hrtime_t], [gl_cv_arithmetic_hrtime_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM([[#include <time.h>]], [[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 - AC_DEFINE([HAVE_ARITHMETIC_HRTIME_T], 1, + AC_DEFINE([HAVE_ARITHMETIC_HRTIME_T], [1], [Define if you have an arithmetic hrtime_t type.]) fi ]) @@ -51,7 +51,7 @@ AC_DEFUN([gl_PREREQ_GETHRXTIME], [ AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_FUNCS_ONCE(microuptime nanouptime) + AC_CHECK_FUNCS_ONCE([microuptime nanouptime]) if test $ac_cv_func_nanouptime != yes; then LIB_GETHRXTIME= diff --git a/m4/getline.m4 b/m4/getline.m4 index 57625da5c9..99933455f0 100644 --- a/m4/getline.m4 +++ b/m4/getline.m4 @@ -1,7 +1,6 @@ -# getline.m4 serial 18 +# getline.m4 serial 19 -dnl Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2005, 2006, 2007 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1998-2003, 2005-2007, 2009 Free Software Foundation, Inc. dnl dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,7 +9,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_PREREQ([2.59]) dnl See if there's a working, system-supplied version of the getline function. -dnl We can't just do AC_REPLACE_FUNCS(getline) because some systems +dnl We can't just do AC_REPLACE_FUNCS([getline]) because some systems dnl have a function by that name in -linet that doesn't have anything dnl to do with the function we need. AC_DEFUN([gl_FUNC_GETLINE], @@ -23,12 +22,12 @@ AC_DEFUN([gl_FUNC_GETLINE], AC_CHECK_DECLS_ONCE([getline]) gl_getline_needs_run_time_check=no - AC_CHECK_FUNC(getline, + AC_CHECK_FUNC([getline], dnl Found it in some library. Verify that it works. gl_getline_needs_run_time_check=yes, am_cv_func_working_getline=no) if test $gl_getline_needs_run_time_check = yes; then - AC_CACHE_CHECK([for working getline function], am_cv_func_working_getline, + AC_CACHE_CHECK([for working getline function], [am_cv_func_working_getline], [echo fooN |tr -d '\012'|tr N '\012' > conftest.data AC_TRY_RUN([ # include <stdio.h> diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 58808f6306..015bcac21d 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -1,7 +1,7 @@ # Check for getloadavg. # Copyright (C) 1992, 1993, 1994, 1995, 1996, 1999, 2000, 2002, 2003, -# 2006, 2008 Free Software Foundation, Inc. +# 2006, 2008, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -27,17 +27,17 @@ test -f "$srcdir/$1/getloadavg.c" || gl_save_LIBS=$LIBS # Check for getloadavg, but be sure not to touch the cache variable. -(AC_CHECK_FUNC(getloadavg, exit 0, exit 1)) && gl_have_func=yes +(AC_CHECK_FUNC([getloadavg], [exit 0], [exit 1])) && gl_have_func=yes # On HPUX9, an unprivileged user can get load averages through this function. -AC_CHECK_FUNCS(pstat_getdynamic) +AC_CHECK_FUNCS([pstat_getdynamic]) # Solaris has libkstat which does not require root. -AC_CHECK_LIB(kstat, kstat_open) +AC_CHECK_LIB([kstat], [kstat_open]) test $ac_cv_lib_kstat_kstat_open = yes && gl_have_func=yes # AIX has libperfstat which does not require root -AC_CHECK_LIB(perfstat, perfstat_cpu_total) +AC_CHECK_LIB([perfstat], [perfstat_cpu_total]) test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_have_func=yes # Some systems with -lutil have (and need) -lkvm as well, some do not. @@ -45,12 +45,12 @@ test $ac_cv_lib_perfstat_perfstat_cpu_total = yes && gl_have_func=yes # to get the right answer into the cache. # For kstat on solaris, we need libelf to force the definition of SVR4 below. if test $gl_have_func = no; then - AC_CHECK_LIB(elf, elf_begin, LIBS="-lelf $LIBS") + AC_CHECK_LIB([elf], [elf_begin], [LIBS="-lelf $LIBS"]) fi if test $gl_have_func = no; then - AC_CHECK_LIB(kvm, kvm_open, LIBS="-lkvm $LIBS") + AC_CHECK_LIB([kvm], [kvm_open], [LIBS="-lkvm $LIBS"]) # Check for the 4.4BSD definition of getloadavg. - AC_CHECK_LIB(util, getloadavg, + AC_CHECK_LIB([util], [getloadavg], [LIBS="-lutil $LIBS" gl_have_func=yes gl_cv_func_getloadavg_setgid=yes]) fi @@ -59,17 +59,17 @@ if test $gl_have_func = no; then # Since it is not a standard part of AIX, it might be installed locally. gl_getloadavg_LIBS=$LIBS LIBS="-L/usr/local/lib $LIBS" - AC_CHECK_LIB(getloadavg, getloadavg, + AC_CHECK_LIB([getloadavg], [getloadavg], [LIBS="-lgetloadavg $LIBS"], [LIBS=$gl_getloadavg_LIBS]) fi # Make sure it is really in the library, if we think we found it, # otherwise set up the replacement function. -AC_CHECK_FUNCS(getloadavg, [], +AC_CHECK_FUNCS([getloadavg], [], [gl_PREREQ_GETLOADAVG]) # Some definitions of getloadavg require that the program be installed setgid. -AC_CACHE_CHECK(whether getloadavg requires setgid, +AC_CACHE_CHECK([whether getloadavg requires setgid], gl_cv_func_getloadavg_setgid, [AC_EGREP_CPP([Yowza Am I SETGID yet], [#define CONFIGURING_GETLOADAVG @@ -82,16 +82,16 @@ Yowza Am I SETGID yet gl_cv_func_getloadavg_setgid=no)]) if test $gl_cv_func_getloadavg_setgid = yes; then NEED_SETGID=true - AC_DEFINE(GETLOADAVG_PRIVILEGED, 1, + AC_DEFINE([GETLOADAVG_PRIVILEGED], [1], [Define to 1 if the `getloadavg' function needs to be run setuid or setgid.]) else NEED_SETGID=false fi -AC_SUBST(NEED_SETGID)dnl +AC_SUBST([NEED_SETGID])dnl if test $gl_cv_func_getloadavg_setgid = yes; then - AC_CACHE_CHECK(group of /dev/kmem, gl_cv_group_kmem, + AC_CACHE_CHECK([group of /dev/kmem], [gl_cv_group_kmem], [ # On Solaris, /dev/kmem is a symlink. Get info on the real file. ac_ls_output=`ls -lgL /dev/kmem 2>/dev/null` # If we got an error (system does not support symlinks), try without -L. @@ -101,7 +101,7 @@ if test $gl_cv_func_getloadavg_setgid = yes; then s/^.[sSrwx-]* *[0-9]* *\([^0-9]*\) *.*/\1/ / /s/.* //;p']` ]) - AC_SUBST(KMEM_GROUP, $gl_cv_group_kmem)dnl + AC_SUBST([KMEM_GROUP], [$gl_cv_group_kmem])dnl fi if test "x$gl_save_LIBS" = x; then GETLOADAVG_LIBS=$LIBS @@ -110,7 +110,7 @@ else fi LIBS=$gl_save_LIBS -AC_SUBST(GETLOADAVG_LIBS)dnl +AC_SUBST([GETLOADAVG_LIBS])dnl # Test whether the system declares getloadavg. Solaris has the function # but declares it in <sys/loadavg.h>, not <stdlib.h>. @@ -132,44 +132,44 @@ AC_CHECK_DECL([getloadavg], [], [HAVE_DECL_GETLOADAVG=0], # -------------------- # Set up the AC_LIBOBJ replacement of `getloadavg'. AC_DEFUN([gl_PREREQ_GETLOADAVG], -[AC_LIBOBJ(getloadavg) -AC_DEFINE(C_GETLOADAVG, 1, [Define to 1 if using `getloadavg.c'.]) +[AC_LIBOBJ([getloadavg]) +AC_DEFINE([C_GETLOADAVG], [1], [Define to 1 if using `getloadavg.c'.]) # Figure out what our getloadavg.c needs. gl_have_func=no -AC_CHECK_HEADER(sys/dg_sys_info.h, +AC_CHECK_HEADER([sys/dg_sys_info.h], [gl_have_func=yes - AC_DEFINE(DGUX, 1, [Define to 1 for DGUX with <sys/dg_sys_info.h>.]) - AC_CHECK_LIB(dgc, dg_sys_info)]) + AC_DEFINE([DGUX], [1], [Define to 1 for DGUX with <sys/dg_sys_info.h>.]) + AC_CHECK_LIB([dgc], [dg_sys_info])]) # We cannot check for <dwarf.h>, because Solaris 2 does not use dwarf (it # uses stabs), but it is still SVR4. We cannot check for <elf.h> because # Irix 4.0.5F has the header but not the library. if test $gl_have_func = no && test "$ac_cv_lib_elf_elf_begin" = yes; then gl_have_func=yes - AC_DEFINE(SVR4, 1, [Define to 1 on System V Release 4.]) + AC_DEFINE([SVR4], [1], [Define to 1 on System V Release 4.]) fi if test $gl_have_func = no; then - AC_CHECK_HEADER(inq_stats/cpustats.h, + AC_CHECK_HEADER([inq_stats/cpustats.h], [gl_have_func=yes - AC_DEFINE(UMAX, 1, [Define to 1 for Encore UMAX.]) - AC_DEFINE(UMAX4_3, 1, + AC_DEFINE([UMAX], [1], [Define to 1 for Encore UMAX.]) + AC_DEFINE([UMAX4_3], [1], [Define to 1 for Encore UMAX 4.3 that has <inq_status/cpustats.h> instead of <sys/cpustats.h>.])]) fi if test $gl_have_func = no; then - AC_CHECK_HEADER(sys/cpustats.h, - [gl_have_func=yes; AC_DEFINE(UMAX)]) + AC_CHECK_HEADER([sys/cpustats.h], + [gl_have_func=yes; AC_DEFINE([UMAX])]) fi if test $gl_have_func = no; then - AC_CHECK_HEADERS(mach/mach.h) + AC_CHECK_HEADERS([mach/mach.h]) fi -AC_CHECK_HEADERS(nlist.h, +AC_CHECK_HEADERS([nlist.h], [AC_CHECK_MEMBERS([struct nlist.n_un.n_name], - [AC_DEFINE(NLIST_NAME_UNION, 1, + [AC_DEFINE([NLIST_NAME_UNION], [1], [Define to 1 if your `struct nlist' has an `n_un' member. Obsolete, depend on `HAVE_STRUCT_NLIST_N_UN_N_NAME])], [], diff --git a/m4/getndelim2.m4 b/m4/getndelim2.m4 index 9aa89a1f96..bf11ebd125 100644 --- a/m4/getndelim2.m4 +++ b/m4/getndelim2.m4 @@ -1,12 +1,12 @@ -# getndelim2.m4 serial 6 -dnl Copyright (C) 2003, 2006, 2008 Free Software Foundation, Inc. +# getndelim2.m4 serial 7 +dnl Copyright (C) 2003, 2006, 2008, 2009 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. AC_DEFUN([gl_GETNDELIM2], [ - AC_LIBOBJ(getndelim2) + AC_LIBOBJ([getndelim2]) gl_PREREQ_GETNDELIM2 AC_CHECK_FUNCS_ONCE([flockfile]) AC_CHECK_FUNCS_ONCE([funlockfile]) diff --git a/m4/getpass.m4 b/m4/getpass.m4 index 54348ce7c7..3b55ee48ec 100644 --- a/m4/getpass.m4 +++ b/m4/getpass.m4 @@ -1,5 +1,5 @@ -# getpass.m4 serial 10 -dnl Copyright (C) 2002-2003, 2005-2006 Free Software Foundation, Inc. +# getpass.m4 serial 11 +dnl Copyright (C) 2002-2003, 2005-2006, 2009 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. @@ -7,8 +7,8 @@ dnl with or without modifications, as long as this notice is preserved. # Provide a getpass() function if the system doesn't have it. AC_DEFUN([gl_FUNC_GETPASS], [ - AC_REPLACE_FUNCS(getpass) - AC_CHECK_DECLS_ONCE(getpass) + AC_REPLACE_FUNCS([getpass]) + AC_CHECK_DECLS_ONCE([getpass]) if test $ac_cv_func_getpass = no; then gl_PREREQ_GETPASS fi @@ -18,9 +18,9 @@ AC_DEFUN([gl_FUNC_GETPASS], # arbitrary length (not just 8 bytes as on HP-UX). AC_DEFUN([gl_FUNC_GETPASS_GNU], [ - AC_CHECK_DECLS_ONCE(getpass) + AC_CHECK_DECLS_ONCE([getpass]) dnl TODO: Detect when GNU getpass() is already found in glibc. - AC_LIBOBJ(getpass) + AC_LIBOBJ([getpass]) gl_PREREQ_GETPASS dnl We must choose a different name for our function, since on ELF systems dnl an unusable getpass() in libc.so would override our getpass() if it is @@ -31,8 +31,8 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU], # Prerequisites of lib/getpass.c. AC_DEFUN([gl_PREREQ_GETPASS], [ - AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h) - AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr) + AC_CHECK_HEADERS_ONCE([stdio_ext.h termios.h]) + AC_CHECK_FUNCS_ONCE([__fsetlocking tcgetattr tcsetattr]) AC_CHECK_DECLS([__fsetlocking],,, [#include <stdio.h> #if HAVE_STDIO_EXT_H diff --git a/m4/gettext.m4 b/m4/gettext.m4 index c48856397b..d90c85008a 100644 --- a/m4/gettext.m4 +++ b/m4/gettext.m4 @@ -1,5 +1,5 @@ -# gettext.m4 serial 61 (gettext-0.18) -dnl Copyright (C) 1995-2008 Free Software Foundation, Inc. +# gettext.m4 serial 62 (gettext-0.18) +dnl Copyright (C) 1995-2009 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. @@ -123,7 +123,7 @@ AC_DEFUN([AM_GNU_GETTEXT], gt_use_preinstalled_gnugettext=no ifelse(gt_included_intl, yes, [ AC_MSG_CHECKING([whether included gettext is requested]) - AC_ARG_WITH(included-gettext, + AC_ARG_WITH([included-gettext], [ --with-included-gettext use the GNU gettext library included here], nls_cv_force_use_gnu_gettext=$withval, nls_cv_force_use_gnu_gettext=no) @@ -267,7 +267,7 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a if test "$gt_use_preinstalled_gnugettext" = "yes" \ || test "$nls_cv_use_gnu_gettext" = "yes"; then - AC_DEFINE([ENABLE_NLS], 1, + AC_DEFINE([ENABLE_NLS], [1], [Define to 1 if translation of program messages to the user's native language is requested.]) else @@ -301,9 +301,9 @@ return * gettext ("")$gt_expression_test_code + _nl_msg_cat_cntr + *_nl_expand_a fi dnl For backward compatibility. Some packages may be using this. - AC_DEFINE([HAVE_GETTEXT], 1, + AC_DEFINE([HAVE_GETTEXT], [1], [Define if the GNU gettext() function is already present or preinstalled.]) - AC_DEFINE([HAVE_DCGETTEXT], 1, + AC_DEFINE([HAVE_DCGETTEXT], [1], [Define if the GNU dcgettext() function is already present or preinstalled.]) fi diff --git a/m4/gettime.m4 b/m4/gettime.m4 index 601a5e6976..11643e8422 100644 --- a/m4/gettime.m4 +++ b/m4/gettime.m4 @@ -1,5 +1,5 @@ -# gettime.m4 serial 6 -dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +# gettime.m4 serial 7 +dnl Copyright (C) 2002, 2004, 2005, 2006, 2009 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. @@ -11,5 +11,5 @@ AC_DEFUN([gl_GETTIME], dnl Prerequisites of lib/gettime.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TIMESPEC]) - AC_CHECK_FUNCS_ONCE(gettimeofday nanotime) + AC_CHECK_FUNCS_ONCE([gettimeofday nanotime]) ]) diff --git a/m4/gettimeofday.m4 b/m4/gettimeofday.m4 index b9bbb1081b..0fec7d42b7 100644 --- a/m4/gettimeofday.m4 +++ b/m4/gettimeofday.m4 @@ -1,6 +1,6 @@ -#serial 11 +# serial 12 -# Copyright (C) 2001, 2002, 2003, 2005, 2007 Free Software Foundation, Inc. +# Copyright (C) 2001-2003, 2005, 2007, 2009 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. @@ -34,7 +34,7 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY], REPLACE_GETTIMEOFDAY=1 SYS_TIME_H=sys/time.h if test $gl_cv_func_gettimeofday_clobber != yes; then - AC_LIBOBJ(gettimeofday) + AC_LIBOBJ([gettimeofday]) gl_PREREQ_GETTIMEOFDAY fi fi @@ -80,13 +80,13 @@ AC_DEFUN([gl_FUNC_GETTIMEOFDAY_CLOBBER], REPLACE_GETTIMEOFDAY=1 SYS_TIME_H=sys/time.h gl_GETTIMEOFDAY_REPLACE_LOCALTIME - AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], 1, + AC_DEFINE([GETTIMEOFDAY_CLOBBERS_LOCALTIME], [1], [Define if gettimeofday clobbers the localtime buffer.]) fi ]) AC_DEFUN([gl_GETTIMEOFDAY_REPLACE_LOCALTIME], [ - AC_LIBOBJ(gettimeofday) + AC_LIBOBJ([gettimeofday]) gl_PREREQ_GETTIMEOFDAY AC_DEFINE([gmtime], [rpl_gmtime], [Define to rpl_gmtime if the replacement function should be used.]) diff --git a/m4/gnulib-common.m4 b/m4/gnulib-common.m4 index c73db14cc5..5804eb9b6f 100644 --- a/m4/gnulib-common.m4 +++ b/m4/gnulib-common.m4 @@ -1,5 +1,5 @@ -# gnulib-common.m4 serial 6 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# gnulib-common.m4 serial 7 +dnl Copyright (C) 2007-2009 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. @@ -63,7 +63,7 @@ m4_ifdef([AC_PROG_MKDIR_P], [], [ # works. # This definition can be removed once autoconf >= 2.62 can be assumed. AC_DEFUN([AC_C_RESTRICT], -[AC_CACHE_CHECK([for C/C++ restrict keyword], ac_cv_c_restrict, +[AC_CACHE_CHECK([for C/C++ restrict keyword], [ac_cv_c_restrict], [ac_cv_c_restrict=no # The order here caters to the fact that C++ does not require restrict. for ac_kw in __restrict __restrict__ _Restrict restrict; do diff --git a/m4/group-member.m4 b/m4/group-member.m4 index 56714912ba..7cefd4db3f 100644 --- a/m4/group-member.m4 +++ b/m4/group-member.m4 @@ -1,7 +1,6 @@ -#serial 11 +# serial 12 -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 Free Software -# Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2007, 2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -16,8 +15,8 @@ AC_DEFUN([gl_FUNC_GROUP_MEMBER], dnl Do this replacement check manually because I want the hyphen dnl (not the underscore) in the filename. - AC_CHECK_FUNC(group_member, , [ - AC_LIBOBJ(group-member) + AC_CHECK_FUNC([group_member], , [ + AC_LIBOBJ([group-member]) gl_PREREQ_GROUP_MEMBER ]) ]) diff --git a/m4/host-os.m4 b/m4/host-os.m4 index 0b7efb61a6..375210bb69 100644 --- a/m4/host-os.m4 +++ b/m4/host-os.m4 @@ -1,6 +1,6 @@ -#serial 6 +# serial 7 -# Copyright (C) 2001, 2003, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2004, 2006, 2009 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. @@ -76,7 +76,7 @@ AC_DEFUN([gl_HOST_OS], os=$host_os;; esac gl_cv_host_operating_system=$os]]) - AC_DEFINE_UNQUOTED(HOST_OPERATING_SYSTEM, + AC_DEFINE_UNQUOTED([HOST_OPERATING_SYSTEM], "$gl_cv_host_operating_system", [The host operating system.]) ]) diff --git a/m4/iconv.m4 b/m4/iconv.m4 index 848b2f85c3..3cc626829e 100644 --- a/m4/iconv.m4 +++ b/m4/iconv.m4 @@ -1,5 +1,5 @@ -# iconv.m4 serial AM6 (gettext-0.18) -dnl Copyright (C) 2000-2002, 2007-2008 Free Software Foundation, Inc. +# iconv.m4 serial AM7 (gettext-0.18) +dnl Copyright (C) 2000-2002, 2007-2009 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. @@ -134,7 +134,7 @@ int main () am_func_iconv=no am_cv_lib_iconv=no fi if test "$am_func_iconv" = yes; then - AC_DEFINE([HAVE_ICONV], 1, + AC_DEFINE([HAVE_ICONV], [1], [Define if you have the iconv() function and it works.]) fi if test "$am_cv_lib_iconv" = yes; then diff --git a/m4/iconv_open.m4 b/m4/iconv_open.m4 index d14da72a2a..c7b948e904 100644 --- a/m4/iconv_open.m4 +++ b/m4/iconv_open.m4 @@ -1,5 +1,5 @@ -# iconv_open.m4 serial 4 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# iconv_open.m4 serial 5 +dnl Copyright (C) 2007-2009 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. @@ -226,7 +226,7 @@ changequote([,])dnl ]) if test $gl_cv_func_iconv_supports_utf = no; then REPLACE_ICONV_UTF=1 - AC_DEFINE([REPLACE_ICONV_UTF], 1, + AC_DEFINE([REPLACE_ICONV_UTF], [1], [Define if the iconv() functions are enhanced to handle the UTF-{16,32}{BE,LE} encodings.]) REPLACE_ICONV=1 gl_REPLACE_ICONV_OPEN diff --git a/m4/inet_ntop.m4 b/m4/inet_ntop.m4 index 6f873063b9..42bfc5e417 100644 --- a/m4/inet_ntop.m4 +++ b/m4/inet_ntop.m4 @@ -1,5 +1,5 @@ -# inet_ntop.m4 serial 7 -dnl Copyright (C) 2005, 2006, 2008 Free Software Foundation, Inc. +# inet_ntop.m4 serial 8 +dnl Copyright (C) 2005, 2006, 2008, 2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_INET_NTOP], gl_REPLACE_ARPA_INET_H - AC_REPLACE_FUNCS(inet_ntop) + AC_REPLACE_FUNCS([inet_ntop]) gl_PREREQ_INET_NTOP ]) diff --git a/m4/inet_pton.m4 b/m4/inet_pton.m4 index 06331e9dec..e0ec432bc6 100644 --- a/m4/inet_pton.m4 +++ b/m4/inet_pton.m4 @@ -1,5 +1,5 @@ -# inet_pton.m4 serial 6 -dnl Copyright (C) 2006, 2008 Free Software Foundation, Inc. +# inet_pton.m4 serial 7 +dnl Copyright (C) 2006, 2008, 2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_INET_PTON], gl_REPLACE_ARPA_INET_H - AC_REPLACE_FUNCS(inet_pton) + AC_REPLACE_FUNCS([inet_pton]) gl_PREREQ_INET_PTON ]) diff --git a/m4/inline.m4 b/m4/inline.m4 index a07076cd6b..cee51099f1 100644 --- a/m4/inline.m4 +++ b/m4/inline.m4 @@ -1,5 +1,5 @@ -# inline.m4 serial 3 -dnl Copyright (C) 2006 Free Software Foundation, Inc. +# inline.m4 serial 4 +dnl Copyright (C) 2006, 2009 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_INLINE], fi ]) if test $gl_cv_c_inline_effective = yes; then - AC_DEFINE([HAVE_INLINE], 1, + AC_DEFINE([HAVE_INLINE], [1], [Define to 1 if the compiler supports one of the keywords 'inline', '__inline__', '__inline' and effectively inlines functions marked as such.]) diff --git a/m4/intldir.m4 b/m4/intldir.m4 index 7a28843f64..85f1d04554 100644 --- a/m4/intldir.m4 +++ b/m4/intldir.m4 @@ -1,5 +1,5 @@ -# intldir.m4 serial 1 (gettext-0.16) -dnl Copyright (C) 2006 Free Software Foundation, Inc. +# intldir.m4 serial 2 (gettext-0.16) +dnl Copyright (C) 2006, 2009 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. @@ -13,7 +13,7 @@ dnl by the GNU Library General Public License, and the rest of the GNU dnl gettext package package is covered by the GNU General Public License. dnl They are *not* in the public domain. -AC_PREREQ(2.52) +AC_PREREQ([2.52]) dnl Tells the AM_GNU_GETTEXT macro to consider an intl/ directory. AC_DEFUN([AM_GNU_GETTEXT_INTL_SUBDIR], []) diff --git a/m4/intlmacosx.m4 b/m4/intlmacosx.m4 index b77527d17d..c24837c429 100644 --- a/m4/intlmacosx.m4 +++ b/m4/intlmacosx.m4 @@ -1,5 +1,5 @@ -# intlmacosx.m4 serial 2 (gettext-0.18) -dnl Copyright (C) 2004-2008 Free Software Foundation, Inc. +# intlmacosx.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2004-2009 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,7 +28,7 @@ AC_DEFUN([gt_INTL_MACOSX], [gt_cv_func_CFPreferencesCopyAppValue=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFPreferencesCopyAppValue = yes; then - AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], 1, + AC_DEFINE([HAVE_CFPREFERENCESCOPYAPPVALUE], [1], [Define to 1 if you have the MacOS X function CFPreferencesCopyAppValue in the CoreFoundation framework.]) fi dnl Check for API introduced in MacOS X 10.3. @@ -40,7 +40,7 @@ AC_DEFUN([gt_INTL_MACOSX], [gt_cv_func_CFLocaleCopyCurrent=no]) LIBS="$gt_save_LIBS"]) if test $gt_cv_func_CFLocaleCopyCurrent = yes; then - AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], 1, + AC_DEFINE([HAVE_CFLOCALECOPYCURRENT], [1], [Define to 1 if you have the MacOS X function CFLocaleCopyCurrent in the CoreFoundation framework.]) fi INTL_MACOSX_LIBS= diff --git a/m4/intmax.m4 b/m4/intmax.m4 index d713db2286..a3785e9989 100644 --- a/m4/intmax.m4 +++ b/m4/intmax.m4 @@ -1,5 +1,5 @@ -# intmax.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 2002-2005, 2008 Free Software Foundation, Inc. +# intmax.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 2002-2005, 2008, 2009 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. @@ -27,7 +27,7 @@ AC_DEFUN([gt_TYPE_INTMAX_T], [gt_cv_c_intmax_t=yes], [gt_cv_c_intmax_t=no])]) if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE([HAVE_INTMAX_T], 1, + AC_DEFINE([HAVE_INTMAX_T], [1], [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) fi ]) diff --git a/m4/intmax_t.m4 b/m4/intmax_t.m4 index 50ae35d223..264cb57184 100644 --- a/m4/intmax_t.m4 +++ b/m4/intmax_t.m4 @@ -1,12 +1,12 @@ -# intmax_t.m4 serial 6 -dnl Copyright (C) 1997-2004, 2006-2007 Free Software Foundation, Inc. +# intmax_t.m4 serial 7 +dnl Copyright (C) 1997-2004, 2006-2007, 2009 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. dnl From Paul Eggert. -AC_PREREQ(2.13) +AC_PREREQ([2.13]) # Define intmax_t to 'long' or 'long long' # if it is not already defined in <stdint.h> or <inttypes.h>. @@ -22,10 +22,10 @@ AC_DEFUN([gl_AC_TYPE_INTMAX_T], test $ac_cv_type_long_long_int = yes \ && ac_type='long long' \ || ac_type='long' - AC_DEFINE_UNQUOTED(intmax_t, $ac_type, + AC_DEFINE_UNQUOTED([intmax_t], [$ac_type], [Define to long or long long if <inttypes.h> and <stdint.h> don't define.]) else - AC_DEFINE(HAVE_INTMAX_T, 1, + AC_DEFINE([HAVE_INTMAX_T], [1], [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) fi ]) @@ -36,7 +36,7 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], [ AC_REQUIRE([gl_AC_HEADER_INTTYPES_H]) AC_REQUIRE([gl_AC_HEADER_STDINT_H]) - AC_CACHE_CHECK(for intmax_t, gt_cv_c_intmax_t, + AC_CACHE_CHECK([for intmax_t], [gt_cv_c_intmax_t], [AC_TRY_COMPILE([ #include <stddef.h> #include <stdlib.h> @@ -48,14 +48,14 @@ AC_DEFUN([gt_AC_TYPE_INTMAX_T], #endif ], [intmax_t x = -1; return !x;], gt_cv_c_intmax_t=yes, gt_cv_c_intmax_t=no)]) if test $gt_cv_c_intmax_t = yes; then - AC_DEFINE(HAVE_INTMAX_T, 1, + AC_DEFINE([HAVE_INTMAX_T], [1], [Define if you have the 'intmax_t' type in <stdint.h> or <inttypes.h>.]) else AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) test $ac_cv_type_long_long_int = yes \ && ac_type='long long' \ || ac_type='long' - AC_DEFINE_UNQUOTED(intmax_t, $ac_type, + AC_DEFINE_UNQUOTED([intmax_t], [$ac_type], [Define to long or long long if <stdint.h> and <inttypes.h> don't define.]) fi ]) diff --git a/m4/inttypes-pri.m4 b/m4/inttypes-pri.m4 index 66650ebdc8..98fec7bcf6 100644 --- a/m4/inttypes-pri.m4 +++ b/m4/inttypes-pri.m4 @@ -1,12 +1,12 @@ -# inttypes-pri.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1997-2002, 2006, 2008 Free Software Foundation, Inc. +# inttypes-pri.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1997-2002, 2006, 2008, 2009 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. dnl From Bruno Haible. -AC_PREREQ(2.52) +AC_PREREQ([2.52]) # Define PRI_MACROS_BROKEN if <inttypes.h> exists and defines the PRI* # macros to non-string values. This is the case on AIX 4.3.3. @@ -26,7 +26,7 @@ char *p = PRId32; ]) fi if test "$gt_cv_inttypes_pri_broken" = yes; then - AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], 1, + AC_DEFINE_UNQUOTED([PRI_MACROS_BROKEN], [1], [Define if <inttypes.h> exists and defines unusable PRI* macros.]) PRI_MACROS_BROKEN=1 else diff --git a/m4/inttypes.m4 b/m4/inttypes.m4 index 448bce6afa..8b4e4f852a 100644 --- a/m4/inttypes.m4 +++ b/m4/inttypes.m4 @@ -1,5 +1,5 @@ -# inttypes.m4 serial 13 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# inttypes.m4 serial 14 +dnl Copyright (C) 2006-2009 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. @@ -152,7 +152,7 @@ const char *l = /* implicit string concatenation */ dnl Also be careful to define __STDC_LIMIT_MACROS only when gnulib's dnl <inttypes.h> is going to be created, and to avoid redefinition warnings dnl if the __STDC_LIMIT_MACROS is already defined through the CPPFLAGS. - AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], 1, + AC_DEFINE([GL_TRIGGER_STDC_LIMIT_MACROS], [1], [Define to make the limit macros in <stdint.h> visible.]) AH_VERBATIM([__STDC_LIMIT_MACROS_ZZZ], [/* Ensure that <stdint.h> defines the limit macros, since gnulib's @@ -240,7 +240,7 @@ const char *l = /* implicit string concatenation */ INTTYPES_H='inttypes.h' fi - AC_SUBST(INTTYPES_H) + AC_SUBST([INTTYPES_H]) ]) # Define the symbol $1 to be 1 if the condition is true, 0 otherwise. diff --git a/m4/inttypes_h.m4 b/m4/inttypes_h.m4 index cf482d2875..f4ca16021c 100644 --- a/m4/inttypes_h.m4 +++ b/m4/inttypes_h.m4 @@ -1,5 +1,5 @@ -# inttypes_h.m4 serial 8 -dnl Copyright (C) 1997-2004, 2006, 2008 Free Software Foundation, Inc. +# inttypes_h.m4 serial 9 +dnl Copyright (C) 1997-2004, 2006, 2008, 2009 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. @@ -19,7 +19,7 @@ AC_DEFUN([gl_AC_HEADER_INTTYPES_H], [gl_cv_header_inttypes_h=yes], [gl_cv_header_inttypes_h=no])]) if test $gl_cv_header_inttypes_h = yes; then - AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], 1, + AC_DEFINE_UNQUOTED([HAVE_INTTYPES_H_WITH_UINTMAX], [1], [Define if <inttypes.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. ]) fi diff --git a/m4/isapipe.m4 b/m4/isapipe.m4 index 04e693435b..1f0673666a 100644 --- a/m4/isapipe.m4 +++ b/m4/isapipe.m4 @@ -1,6 +1,6 @@ # Test whether a file descriptor is a pipe. -dnl Copyright (C) 2006 Free Software Foundation, Inc. +dnl Copyright (C) 2006, 2009 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 @@ dnl Written by Paul Eggert. AC_DEFUN([gl_ISAPIPE], [ # OpenVMS has isapipe already, so check for it. - AC_REPLACE_FUNCS(isapipe) + AC_REPLACE_FUNCS([isapipe]) if test $ac_cv_func_isapipe = no; then gl_PREREQ_ISAPIPE fi @@ -73,11 +73,11 @@ AC_DEFUN([gl_PREREQ_ISAPIPE], case $gl_cv_pipes_are_fifos in #( 'yes ('*')') - AC_DEFINE([HAVE_FIFO_PIPES], 1, + AC_DEFINE([HAVE_FIFO_PIPES], [1], [Define to 1 if pipes are FIFOs, 0 if sockets. Leave undefined if not known.]);; #( 'no ('*')') - AC_DEFINE([HAVE_FIFO_PIPES], 0);; + AC_DEFINE([HAVE_FIFO_PIPES], [0]);; esac case $gl_cv_pipes_are_fifos in #( diff --git a/m4/isnand.m4 b/m4/isnand.m4 index 35bdfa7d8f..c823c2ce65 100644 --- a/m4/isnand.m4 +++ b/m4/isnand.m4 @@ -1,5 +1,5 @@ -# isnand.m4 serial 5 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# isnand.m4 serial 6 +dnl Copyright (C) 2007-2009 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. @@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_ISNAND_NO_LIBM], [ gl_HAVE_ISNAND_NO_LIBM if test $gl_cv_func_isnand_no_libm = yes; then - AC_DEFINE([HAVE_ISNAND_IN_LIBC], 1, + AC_DEFINE([HAVE_ISNAND_IN_LIBC], [1], [Define if the isnan(double) function is available in libc.]) else gl_BUILD_ISNAND diff --git a/m4/isnanf.m4 b/m4/isnanf.m4 index 7d1f25d73b..2ad8f94536 100644 --- a/m4/isnanf.m4 +++ b/m4/isnanf.m4 @@ -1,5 +1,5 @@ -# isnanf.m4 serial 9 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# isnanf.m4 serial 10 +dnl Copyright (C) 2007-2009 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. @@ -51,7 +51,7 @@ AC_DEFUN([gl_FUNC_ISNANF_NO_LIBM], *) false;; esac }; then - AC_DEFINE([HAVE_ISNANF_IN_LIBC], 1, + AC_DEFINE([HAVE_ISNANF_IN_LIBC], [1], [Define if the isnan(float) function is available in libc.]) else gl_BUILD_ISNANF diff --git a/m4/isnanl.m4 b/m4/isnanl.m4 index c5605ee8cb..af028cde12 100644 --- a/m4/isnanl.m4 +++ b/m4/isnanl.m4 @@ -1,5 +1,5 @@ -# isnanl.m4 serial 9 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# isnanl.m4 serial 10 +dnl Copyright (C) 2007-2009 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. @@ -47,7 +47,7 @@ AC_DEFUN([gl_FUNC_ISNANL_NO_LIBM], esac fi if test $gl_func_isnanl_no_libm = yes; then - AC_DEFINE([HAVE_ISNANL_IN_LIBC], 1, + AC_DEFINE([HAVE_ISNANL_IN_LIBC], [1], [Define if the isnan(long double) function is available in libc.]) else gl_BUILD_ISNANL diff --git a/m4/javacomp.m4 b/m4/javacomp.m4 index 7e3e64aa3b..e5e2f0eb86 100644 --- a/m4/javacomp.m4 +++ b/m4/javacomp.m4 @@ -1,5 +1,5 @@ -# javacomp.m4 serial 10 -dnl Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc. +# javacomp.m4 serial 11 +dnl Copyright (C) 2001-2003, 2006-2007, 2009 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. @@ -58,7 +58,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gt_JAVACOMP], [ ifelse([$2], [], [AC_REQUIRE([gt_JAVAEXEC])], []) - AC_EGREP_CPP(yes, [ + AC_EGREP_CPP([yes], [ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ yes #endif @@ -404,9 +404,9 @@ changequote([,])dnl pushdef([AC_MSG_CHECKING],[:])dnl pushdef([AC_CHECKING],[:])dnl pushdef([AC_MSG_RESULT],[:])dnl - AC_CHECK_PROG(HAVE_GCJ_IN_PATH, gcj, yes) - AC_CHECK_PROG(HAVE_JAVAC_IN_PATH, javac, yes) - AC_CHECK_PROG(HAVE_JIKES_IN_PATH, jikes, yes) + AC_CHECK_PROG([HAVE_GCJ_IN_PATH], [gcj], [yes]) + AC_CHECK_PROG([HAVE_JAVAC_IN_PATH], [javac], [yes]) + AC_CHECK_PROG([HAVE_JIKES_IN_PATH], [jikes], [yes]) popdef([AC_MSG_RESULT])dnl popdef([AC_CHECKING])dnl popdef([AC_MSG_CHECKING])dnl @@ -626,11 +626,11 @@ changequote([,])dnl ac_result="no" fi AC_MSG_RESULT([$ac_result]) - AC_SUBST(CONF_JAVAC) - AC_SUBST(CLASSPATH) - AC_SUBST(CLASSPATH_SEPARATOR) - AC_SUBST(HAVE_JAVAC_ENVVAR) - AC_SUBST(HAVE_GCJ_C) - AC_SUBST(HAVE_JAVAC) - AC_SUBST(HAVE_JIKES) + AC_SUBST([CONF_JAVAC]) + AC_SUBST([CLASSPATH]) + AC_SUBST([CLASSPATH_SEPARATOR]) + AC_SUBST([HAVE_JAVAC_ENVVAR]) + AC_SUBST([HAVE_GCJ_C]) + AC_SUBST([HAVE_JAVAC]) + AC_SUBST([HAVE_JIKES]) ]) diff --git a/m4/javaexec.m4 b/m4/javaexec.m4 index 4f3b087e62..607a130ace 100644 --- a/m4/javaexec.m4 +++ b/m4/javaexec.m4 @@ -1,5 +1,5 @@ -# javaexec.m4 serial 4 (gettext-0.15) -dnl Copyright (C) 2001-2003, 2006 Free Software Foundation, Inc. +# javaexec.m4 serial 5 (gettext-0.15) +dnl Copyright (C) 2001-2003, 2006, 2009 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. @@ -11,7 +11,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gt_JAVAEXEC], [ AC_MSG_CHECKING([for Java virtual machine]) - AC_EGREP_CPP(yes, [ + AC_EGREP_CPP([yes], [ #if defined _WIN32 || defined __WIN32__ || defined __CYGWIN__ || defined __EMX__ || defined __DJGPP__ yes #endif @@ -30,10 +30,10 @@ AC_DEFUN([gt_JAVAEXEC], pushdef([AC_MSG_CHECKING],[:])dnl pushdef([AC_CHECKING],[:])dnl pushdef([AC_MSG_RESULT],[:])dnl - AC_CHECK_PROG(HAVE_GIJ_IN_PATH, gij, yes) - AC_CHECK_PROG(HAVE_JAVA_IN_PATH, java, yes) - AC_CHECK_PROG(HAVE_JRE_IN_PATH, jre, yes) - AC_CHECK_PROG(HAVE_JVIEW_IN_PATH, jview, yes) + AC_CHECK_PROG([HAVE_GIJ_IN_PATH], [gij], [yes]) + AC_CHECK_PROG([HAVE_JAVA_IN_PATH], [java], [yes]) + AC_CHECK_PROG([HAVE_JRE_IN_PATH], [jre], [yes]) + AC_CHECK_PROG([HAVE_JVIEW_IN_PATH], [jview], [yes]) popdef([AC_MSG_RESULT])dnl popdef([AC_CHECKING])dnl popdef([AC_MSG_CHECKING])dnl @@ -93,12 +93,12 @@ AC_DEFUN([gt_JAVAEXEC], ac_result="no" fi AC_MSG_RESULT([$ac_result]) - AC_SUBST(CONF_JAVA) - AC_SUBST(CLASSPATH) - AC_SUBST(CLASSPATH_SEPARATOR) - AC_SUBST(HAVE_JAVA_ENVVAR) - AC_SUBST(HAVE_GIJ) - AC_SUBST(HAVE_JAVA) - AC_SUBST(HAVE_JRE) - AC_SUBST(HAVE_JVIEW) + AC_SUBST([CONF_JAVA]) + AC_SUBST([CLASSPATH]) + AC_SUBST([CLASSPATH_SEPARATOR]) + AC_SUBST([HAVE_JAVA_ENVVAR]) + AC_SUBST([HAVE_GIJ]) + AC_SUBST([HAVE_JAVA]) + AC_SUBST([HAVE_JRE]) + AC_SUBST([HAVE_JVIEW]) ]) diff --git a/m4/jm-winsz1.m4 b/m4/jm-winsz1.m4 index bde5cc5abb..40aa8b5e6e 100644 --- a/m4/jm-winsz1.m4 +++ b/m4/jm-winsz1.m4 @@ -1,6 +1,7 @@ -#serial 9 +# serial 10 -# Copyright (C) 1996, 1999, 2001, 2002, 2004, 2006 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999, 2001-2002, 2004, 2006, 2009 +# 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. @@ -42,6 +43,6 @@ AC_DEFUN([gl_WINSIZE_IN_PTEM], [], [gl_cv_sys_struct_winsize_needs_sys_ptem_h=no]) fi]) if test $gl_cv_sys_struct_winsize_needs_sys_ptem_h = yes; then - AC_DEFINE([WINSIZE_IN_PTEM], 1, + AC_DEFINE([WINSIZE_IN_PTEM], [1], [Define if sys/ptem.h is required for struct winsize.]) fi]) diff --git a/m4/jm-winsz2.m4 b/m4/jm-winsz2.m4 index ee710a552c..f3155e72e3 100644 --- a/m4/jm-winsz2.m4 +++ b/m4/jm-winsz2.m4 @@ -1,6 +1,6 @@ -#serial 6 +# serial 7 -# Copyright (C) 1996, 1999, 2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999, 2001, 2004, 2009 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. @@ -22,7 +22,7 @@ AC_DEFUN([gl_HEADER_TIOCGWINSZ_NEEDS_SYS_IOCTL], fi ]) if test $gl_cv_sys_tiocgwinsz_needs_sys_ioctl_h = yes; then - AC_DEFINE(GWINSZ_IN_SYS_IOCTL, 1, + AC_DEFINE([GWINSZ_IN_SYS_IOCTL], [1], [Define if your system defines TIOCGWINSZ in sys/ioctl.h.]) fi ]) diff --git a/m4/lchown.m4 b/m4/lchown.m4 index b719ed074c..f509fde04a 100644 --- a/m4/lchown.m4 +++ b/m4/lchown.m4 @@ -1,8 +1,7 @@ -#serial 12 +# serial 13 # Determine whether we need the lchown wrapper. -dnl Copyright (C) 1998, 2001, 2003, 2004, 2005, 2006, 2007 Free -dnl Software Foundation, Inc. +dnl Copyright (C) 1998, 2001, 2003-2007, 2009 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,7 +14,7 @@ AC_DEFUN([gl_FUNC_LCHOWN], [ AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) AC_REQUIRE([gl_FUNC_CHOWN]) - AC_REPLACE_FUNCS(lchown) + AC_REPLACE_FUNCS([lchown]) if test $ac_cv_func_lchown = no; then REPLACE_LCHOWN=1 fi diff --git a/m4/lcmessage.m4 b/m4/lcmessage.m4 index b7c4730272..fa8e4167ac 100644 --- a/m4/lcmessage.m4 +++ b/m4/lcmessage.m4 @@ -1,5 +1,5 @@ -# lcmessage.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1995-2002, 2004-2005, 2008 Free Software Foundation, Inc. +# lcmessage.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1995-2002, 2004-2005, 2008, 2009 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. @@ -24,7 +24,7 @@ AC_DEFUN([gt_LC_MESSAGES], [AC_TRY_LINK([#include <locale.h>], [return LC_MESSAGES], [gt_cv_val_LC_MESSAGES=yes], [gt_cv_val_LC_MESSAGES=no])]) if test $gt_cv_val_LC_MESSAGES = yes; then - AC_DEFINE([HAVE_LC_MESSAGES], 1, + AC_DEFINE([HAVE_LC_MESSAGES], [1], [Define if your <locale.h> file defines LC_MESSAGES.]) fi ]) diff --git a/m4/ldexpl.m4 b/m4/ldexpl.m4 index 9a9d383e4a..8ba85c615e 100644 --- a/m4/ldexpl.m4 +++ b/m4/ldexpl.m4 @@ -1,5 +1,5 @@ -# ldexpl.m4 serial 3 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# ldexpl.m4 serial 4 +dnl Copyright (C) 2007-2009 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. @@ -48,7 +48,7 @@ AC_DEFUN([gl_FUNC_LDEXPL], gl_func_ldexpl=no fi if test $gl_func_ldexpl = yes; then - AC_DEFINE([HAVE_LDEXPL], 1, + AC_DEFINE([HAVE_LDEXPL], [1], [Define if the ldexpl() function is available.]) dnl Also check whether it's declared. dnl MacOS X 10.3 has ldexpl() in libc but doesn't declare it in <math.h>. diff --git a/m4/lib-ld.m4 b/m4/lib-ld.m4 index 96c4e2c339..2f0752c954 100644 --- a/m4/lib-ld.m4 +++ b/m4/lib-ld.m4 @@ -1,5 +1,5 @@ -# lib-ld.m4 serial 3 (gettext-0.13) -dnl Copyright (C) 1996-2003 Free Software Foundation, Inc. +# lib-ld.m4 serial 4 (gettext-0.13) +dnl Copyright (C) 1996-2003, 2009 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. @@ -10,7 +10,7 @@ dnl with libtool.m4. dnl From libtool-1.4. Sets the variable with_gnu_ld to yes or no. AC_DEFUN([AC_LIB_PROG_LD_GNU], -[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], acl_cv_prog_gnu_ld, +[AC_CACHE_CHECK([if the linker ($LD) is GNU ld], [acl_cv_prog_gnu_ld], [# I'd rather use --version here, but apparently some GNU ld's only accept -v. case `$LD -v 2>&1 </dev/null` in *GNU* | *'with BFD'*) @@ -23,7 +23,7 @@ with_gnu_ld=$acl_cv_prog_gnu_ld dnl From libtool-1.4. Sets the variable LD. AC_DEFUN([AC_LIB_PROG_LD], -[AC_ARG_WITH(gnu-ld, +[AC_ARG_WITH([gnu-ld], [ --with-gnu-ld assume the C compiler uses GNU ld [default=no]], test "$withval" = no || with_gnu_ld=yes, with_gnu_ld=no) AC_REQUIRE([AC_PROG_CC])dnl @@ -77,7 +77,7 @@ elif test "$with_gnu_ld" = yes; then else AC_MSG_CHECKING([for non-GNU ld]) fi -AC_CACHE_VAL(acl_cv_path_LD, +AC_CACHE_VAL([acl_cv_path_LD], [if test -z "$LD"; then IFS="${IFS= }"; ac_save_ifs="$IFS"; IFS="${IFS}${PATH_SEPARATOR-:}" for ac_dir in $PATH; do @@ -101,9 +101,9 @@ else fi]) LD="$acl_cv_path_LD" if test -n "$LD"; then - AC_MSG_RESULT($LD) + AC_MSG_RESULT([$LD]) else - AC_MSG_RESULT(no) + AC_MSG_RESULT([no]) fi test -z "$LD" && AC_MSG_ERROR([no acceptable ld found in \$PATH]) AC_LIB_PROG_LD_GNU diff --git a/m4/lib-link.m4 b/m4/lib-link.m4 index e29eead276..fcd3391bbc 100644 --- a/m4/lib-link.m4 +++ b/m4/lib-link.m4 @@ -1,12 +1,12 @@ -# lib-link.m4 serial 17 (gettext-0.18) -dnl Copyright (C) 2001-2008 Free Software Foundation, Inc. +# lib-link.m4 serial 18 (gettext-0.18) +dnl Copyright (C) 2001-2009 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. dnl From Bruno Haible. -AC_PREREQ(2.54) +AC_PREREQ([2.54]) dnl AC_LIB_LINKFLAGS(name [, dependencies]) searches for libname and dnl the libraries corresponding to explicit and implicit dependencies. @@ -114,7 +114,7 @@ AC_DEFUN([AC_LIB_RPATH], AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD, $with_gnu_ld AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library run path origin], acl_cv_rpath, [ + AC_CACHE_CHECK([for shared library run path origin], [acl_cv_rpath], [ CC="$CC" GCC="$GCC" LDFLAGS="$LDFLAGS" LD="$LD" with_gnu_ld="$with_gnu_ld" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.rpath" "$host" > conftest.sh . ./conftest.sh @@ -131,7 +131,7 @@ AC_DEFUN([AC_LIB_RPATH], acl_hardcode_direct="$acl_cv_hardcode_direct" acl_hardcode_minus_L="$acl_cv_hardcode_minus_L" dnl Determine whether the user wants rpath handling at all. - AC_ARG_ENABLE(rpath, + AC_ARG_ENABLE([rpath], [ --disable-rpath do not hardcode runtime library paths], :, enable_rpath=yes) ]) diff --git a/m4/libsigsegv.m4 b/m4/libsigsegv.m4 index cf36a3a6f9..ecd81f2f96 100644 --- a/m4/libsigsegv.m4 +++ b/m4/libsigsegv.m4 @@ -1,5 +1,5 @@ -# libsigsegv.m4 serial 2 -dnl Copyright (C) 2002-2003, 2008 Free Software Foundation, Inc. +# libsigsegv.m4 serial 3 +dnl Copyright (C) 2002-2003, 2008, 2009 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,7 +22,7 @@ AC_DEFUN([gl_LIBSIGSEGV], gl_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCSIGSEGV]) - AC_CACHE_CHECK([for libsigsegv], gl_cv_lib_sigsegv, [ + AC_CACHE_CHECK([for libsigsegv], [gl_cv_lib_sigsegv], [ gl_cv_lib_sigsegv="no, consider installing GNU libsigsegv" gl_save_LIBS="$LIBS" LIBS="$LIBS $LIBSIGSEGV" @@ -32,7 +32,7 @@ AC_DEFUN([gl_LIBSIGSEGV], LIBS="$gl_save_LIBS" ]) if test "$gl_cv_lib_sigsegv" = yes; then - AC_DEFINE([HAVE_LIBSIGSEGV], 1, + AC_DEFINE([HAVE_LIBSIGSEGV], [1], [Define if you have the libsigsegv library.]) AC_MSG_CHECKING([how to link with libsigsegv]) AC_MSG_RESULT([$LIBSIGSEGV]) @@ -43,6 +43,6 @@ AC_DEFUN([gl_LIBSIGSEGV], LIBSIGSEGV= LTLIBSIGSEGV= fi - AC_SUBST(LIBSIGSEGV) - AC_SUBST(LTLIBSIGSEGV) + AC_SUBST([LIBSIGSEGV]) + AC_SUBST([LTLIBSIGSEGV]) ]) diff --git a/m4/link-follow.m4 b/m4/link-follow.m4 index ceec0675c5..14ce6ffa5e 100644 --- a/m4/link-follow.m4 +++ b/m4/link-follow.m4 @@ -1,8 +1,8 @@ -#serial 9 +# serial 10 dnl Run a program to determine whether link(2) follows symlinks. dnl Set LINK_FOLLOWS_SYMLINKS accordingly. -# Copyright (C) 1999, 2000, 2001, 2004, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2004-2006, 2009 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. @@ -58,7 +58,7 @@ AC_DEFUN([gl_AC_FUNC_LINK_FOLLOWS_SYMLINK], ) ]) if test $gl_ac_cv_func_link_follows_symlink = yes; then - AC_DEFINE(LINK_FOLLOWS_SYMLINKS, 1, + AC_DEFINE([LINK_FOLLOWS_SYMLINKS], [1], [Define if `link(2)' dereferences symbolic links.]) fi ]) diff --git a/m4/localcharset.m4 b/m4/localcharset.m4 index b2b77338e3..e9601041c5 100644 --- a/m4/localcharset.m4 +++ b/m4/localcharset.m4 @@ -1,5 +1,5 @@ -# localcharset.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2006 Free Software Foundation, Inc. +# localcharset.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2006, 2009 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. @@ -8,7 +8,7 @@ AC_DEFUN([gl_LOCALCHARSET], [ dnl Prerequisites of lib/localcharset.c. AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CHECK_DECLS_ONCE(getc_unlocked) + AC_CHECK_DECLS_ONCE([getc_unlocked]) dnl Prerequisites of the lib/Makefile.am snippet. AC_REQUIRE([AC_CANONICAL_HOST]) diff --git a/m4/locale-fr.m4 b/m4/locale-fr.m4 index ac8a78d2c2..e471839e9f 100644 --- a/m4/locale-fr.m4 +++ b/m4/locale-fr.m4 @@ -1,5 +1,5 @@ -# locale-fr.m4 serial 9 -dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc. +# locale-fr.m4 serial 10 +dnl Copyright (C) 2003, 2005-2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gt_LOCALE_FR], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a traditional french locale], gt_cv_locale_fr, [ + AC_CACHE_CHECK([for a traditional french locale], [gt_cv_locale_fr], [ macosx= changequote(,)dnl case "$host_os" in @@ -120,7 +120,7 @@ dnl Determine the name of a french locale with UTF-8 encoding. AC_DEFUN([gt_LOCALE_FR_UTF8], [ AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a french Unicode locale], gt_cv_locale_fr_utf8, [ + AC_CACHE_CHECK([for a french Unicode locale], [gt_cv_locale_fr_utf8], [ AC_LANG_CONFTEST([AC_LANG_SOURCE([ changequote(,)dnl #include <locale.h> diff --git a/m4/locale-ja.m4 b/m4/locale-ja.m4 index c42064f721..c80c5af913 100644 --- a/m4/locale-ja.m4 +++ b/m4/locale-ja.m4 @@ -1,5 +1,5 @@ -# locale-ja.m4 serial 5 -dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc. +# locale-ja.m4 serial 6 +dnl Copyright (C) 2003, 2005-2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gt_LOCALE_JA], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a traditional japanese locale], gt_cv_locale_ja, [ + AC_CACHE_CHECK([for a traditional japanese locale], [gt_cv_locale_ja], [ macosx= changequote(,)dnl case "$host_os" in diff --git a/m4/locale-tr.m4 b/m4/locale-tr.m4 index d6a2088e8a..6162f65ccc 100644 --- a/m4/locale-tr.m4 +++ b/m4/locale-tr.m4 @@ -1,5 +1,5 @@ -# locale-tr.m4 serial 5 -dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc. +# locale-tr.m4 serial 6 +dnl Copyright (C) 2003, 2005-2009 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. @@ -10,7 +10,7 @@ dnl Determine the name of a turkish locale with UTF-8 encoding. AC_DEFUN([gt_LOCALE_TR_UTF8], [ AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a turkish Unicode locale], gt_cv_locale_tr_utf8, [ + AC_CACHE_CHECK([for a turkish Unicode locale], [gt_cv_locale_tr_utf8], [ AC_LANG_CONFTEST([AC_LANG_SOURCE([ changequote(,)dnl #include <locale.h> diff --git a/m4/locale-zh.m4 b/m4/locale-zh.m4 index 594f62a696..ba7f9c5c94 100644 --- a/m4/locale-zh.m4 +++ b/m4/locale-zh.m4 @@ -1,5 +1,5 @@ -# locale-zh.m4 serial 4 -dnl Copyright (C) 2003, 2005-2008 Free Software Foundation, Inc. +# locale-zh.m4 serial 5 +dnl Copyright (C) 2003, 2005-2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gt_LOCALE_ZH_CN], [ AC_REQUIRE([AC_CANONICAL_HOST]) AC_REQUIRE([AM_LANGINFO_CODESET]) - AC_CACHE_CHECK([for a transitional chinese locale], gt_cv_locale_zh_CN, [ + AC_CACHE_CHECK([for a transitional chinese locale], [gt_cv_locale_zh_CN], [ macosx= changequote(,)dnl case "$host_os" in diff --git a/m4/lock.m4 b/m4/lock.m4 index 9fec570dcd..b416e31a35 100644 --- a/m4/lock.m4 +++ b/m4/lock.m4 @@ -1,5 +1,5 @@ -# lock.m4 serial 9 (gettext-0.18) -dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. +# lock.m4 serial 10 (gettext-0.18) +dnl Copyright (C) 2005-2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_LOCK], # OSF/1 4.0 and MacOS X 10.1 lack the pthread_rwlock_t type and the # pthread_rwlock_* functions. AC_CHECK_TYPE([pthread_rwlock_t], - [AC_DEFINE([HAVE_PTHREAD_RWLOCK], 1, + [AC_DEFINE([HAVE_PTHREAD_RWLOCK], [1], [Define if the POSIX multithreading library has read/write locks.])], [], [#include <pthread.h>]) @@ -25,7 +25,7 @@ error "No, in FreeBSD 4.0 recursive mutexes actually don't work." int x = (int)PTHREAD_MUTEX_RECURSIVE; return !x; #endif], - [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], 1, + [AC_DEFINE([HAVE_PTHREAD_MUTEX_RECURSIVE], [1], [Define if the <pthread.h> defines PTHREAD_MUTEX_RECURSIVE.])]) fi gl_PREREQ_LOCK diff --git a/m4/longlong.m4 b/m4/longlong.m4 index 15bf9dacad..eedc8d5682 100644 --- a/m4/longlong.m4 +++ b/m4/longlong.m4 @@ -1,5 +1,5 @@ -# longlong.m4 serial 13 -dnl Copyright (C) 1999-2007 Free Software Foundation, Inc. +# longlong.m4 serial 14 +dnl Copyright (C) 1999-2007, 2009 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([AC_TYPE_LONG_LONG_INT], [ac_cv_type_long_long_int=yes])], [ac_cv_type_long_long_int=no])]) if test $ac_cv_type_long_long_int = yes; then - AC_DEFINE([HAVE_LONG_LONG_INT], 1, + AC_DEFINE([HAVE_LONG_LONG_INT], [1], [Define to 1 if the system has the type `long long int'.]) fi ]) @@ -69,7 +69,7 @@ AC_DEFUN([AC_TYPE_UNSIGNED_LONG_LONG_INT], [ac_cv_type_unsigned_long_long_int=yes], [ac_cv_type_unsigned_long_long_int=no])]) if test $ac_cv_type_unsigned_long_long_int = yes; then - AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], 1, + AC_DEFINE([HAVE_UNSIGNED_LONG_LONG_INT], [1], [Define to 1 if the system has the type `unsigned long long int'.]) fi ]) diff --git a/m4/ls-mntd-fs.m4 b/m4/ls-mntd-fs.m4 index 21ac4e743b..32ccb984df 100644 --- a/m4/ls-mntd-fs.m4 +++ b/m4/ls-mntd-fs.m4 @@ -1,8 +1,7 @@ -#serial 26 +# serial 27 # How to list mounted file systems. -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006 Free Software -# Foundation, Inc. +# Copyright (C) 1998-2004, 2006, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -20,27 +19,27 @@ dnl AC_DEFUN([AC_FUNC_GETMNTENT], [# getmntent is in the standard C library on UNICOS, in -lsun on Irix 4, # -lseq on Dynix/PTX, -lgen on Unixware. -AC_SEARCH_LIBS(getmntent, [sun seq gen]) -AC_CHECK_FUNCS(getmntent) +AC_SEARCH_LIBS([getmntent], [sun seq gen]) +AC_CHECK_FUNCS([getmntent]) ]) # gl_LIST_MOUNTED_FILE_SYSTEMS([ACTION-IF-FOUND[, ACTION-IF-NOT-FOUND]]) AC_DEFUN([gl_LIST_MOUNTED_FILE_SYSTEMS], [ -AC_CHECK_FUNCS(listmntent getmntinfo) -AC_CHECK_HEADERS_ONCE(sys/param.h sys/statvfs.h) +AC_CHECK_FUNCS([listmntent getmntinfo]) +AC_CHECK_HEADERS_ONCE([sys/param.h sys/statvfs.h]) # We must include grp.h before ucred.h on OSF V4.0, since ucred.h uses # NGROUPS (as the array dimension for a struct member) without a definition. -AC_CHECK_HEADERS(sys/ucred.h, [], [], [#include <grp.h>]) +AC_CHECK_HEADERS([sys/ucred.h], [], [], [#include <grp.h>]) -AC_CHECK_HEADERS(sys/mount.h, [], [], +AC_CHECK_HEADERS([sys/mount.h], [], [], [AC_INCLUDES_DEFAULT [#if HAVE_SYS_PARAM_H #include <sys/param.h> #endif]]) -AC_CHECK_HEADERS(mntent.h sys/fs_types.h) +AC_CHECK_HEADERS([mntent.h sys/fs_types.h]) getfsstat_includes="\ $ac_includes_default #if HAVE_SYS_PARAM_H @@ -78,9 +77,9 @@ AC_FUNC_GETMNTENT if test -z "$ac_list_mounted_fs"; then # Cray UNICOS 9 AC_MSG_CHECKING([for listmntent of Cray/Unicos-9]) - AC_CACHE_VAL(fu_cv_sys_mounted_cray_listmntent, + AC_CACHE_VAL([fu_cv_sys_mounted_cray_listmntent], [fu_cv_sys_mounted_cray_listmntent=no - AC_EGREP_CPP(yes, + AC_EGREP_CPP([yes], [#ifdef _CRAY yes #endif @@ -89,10 +88,10 @@ yes ) ] ) - AC_MSG_RESULT($fu_cv_sys_mounted_cray_listmntent) + AC_MSG_RESULT([$fu_cv_sys_mounted_cray_listmntent]) if test $fu_cv_sys_mounted_cray_listmntent = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_LISTMNTENT, 1, + AC_DEFINE([MOUNTED_LISTMNTENT], [1], [Define if there is a function named listmntent that can be used to list all mounted file systems. (UNICOS)]) fi @@ -101,14 +100,14 @@ fi if test -z "$ac_list_mounted_fs"; then # AIX. AC_MSG_CHECKING([for mntctl function and struct vmount]) - AC_CACHE_VAL(fu_cv_sys_mounted_vmount, + AC_CACHE_VAL([fu_cv_sys_mounted_vmount], [AC_TRY_CPP([#include <fshelp.h>], fu_cv_sys_mounted_vmount=yes, fu_cv_sys_mounted_vmount=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_vmount) + AC_MSG_RESULT([$fu_cv_sys_mounted_vmount]) if test $fu_cv_sys_mounted_vmount = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_VMOUNT, 1, + AC_DEFINE([MOUNTED_VMOUNT], [1], [Define if there is a function named mntctl that can be used to read the list of mounted file systems, and there is a system header file that declares `struct vmount.' (AIX)]) @@ -123,7 +122,7 @@ if test $ac_cv_func_getmntent = yes; then if test -z "$ac_list_mounted_fs"; then # 4.3BSD, SunOS, HP-UX, Dynix, Irix AC_MSG_CHECKING([for one-argument getmntent function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntent1, + AC_CACHE_VAL([fu_cv_sys_mounted_getmntent1], [AC_TRY_COMPILE([ /* SunOS 4.1.x /usr/include/mntent.h needs this for FILE */ #include <stdio.h> @@ -145,10 +144,10 @@ if test $ac_cv_func_getmntent = yes; then if (sizeof mnt && sizeof table) return 0;], fu_cv_sys_mounted_getmntent1=yes, fu_cv_sys_mounted_getmntent1=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntent1) + AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent1]) if test $fu_cv_sys_mounted_getmntent1 = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTENT1, 1, + AC_DEFINE([MOUNTED_GETMNTENT1], [1], [Define if there is a function named getmntent for reading the list of mounted file systems, and that function takes a single argument. (4.3BSD, SunOS, HP-UX, Dynix, Irix)]) @@ -158,17 +157,17 @@ if test $ac_cv_func_getmntent = yes; then if test -z "$ac_list_mounted_fs"; then # SVR4 AC_MSG_CHECKING([for two-argument getmntent function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntent2, - [AC_EGREP_HEADER(getmntent, sys/mnttab.h, + AC_CACHE_VAL([fu_cv_sys_mounted_getmntent2], + [AC_EGREP_HEADER([getmntent], [sys/mnttab.h], fu_cv_sys_mounted_getmntent2=yes, fu_cv_sys_mounted_getmntent2=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntent2) + AC_MSG_RESULT([$fu_cv_sys_mounted_getmntent2]) if test $fu_cv_sys_mounted_getmntent2 = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTENT2, 1, + AC_DEFINE([MOUNTED_GETMNTENT2], [1], [Define if there is a function named getmntent for reading the list of mounted file systems, and that function takes two arguments. (SVR4)]) - AC_CHECK_FUNCS(hasmntopt) + AC_CHECK_FUNCS([hasmntopt]) fi fi @@ -179,7 +178,7 @@ if test -z "$ac_list_mounted_fs"; then # powerpc-apple-darwin1.3.7 needs sys/param.h sys/ucred.h sys/fs_types.h AC_MSG_CHECKING([for getfsstat function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getfsstat, + AC_CACHE_VAL([fu_cv_sys_mounted_getfsstat], [AC_TRY_LINK([ #include <sys/types.h> #if HAVE_STRUCT_FSSTAT_F_FSTYPENAME @@ -194,10 +193,10 @@ if test -z "$ac_list_mounted_fs"; then char *t = FS_TYPE (*stats); ], fu_cv_sys_mounted_getfsstat=yes, fu_cv_sys_mounted_getfsstat=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getfsstat) + AC_MSG_RESULT([$fu_cv_sys_mounted_getfsstat]) if test $fu_cv_sys_mounted_getfsstat = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_GETFSSTAT, 1, + AC_DEFINE([MOUNTED_GETFSSTAT], [1], [Define if there is a function named getfsstat for reading the list of mounted file systems. (DEC Alpha running OSF/1)]) fi @@ -206,17 +205,17 @@ fi if test -z "$ac_list_mounted_fs"; then # SVR3 AC_MSG_CHECKING([for FIXME existence of three headers]) - AC_CACHE_VAL(fu_cv_sys_mounted_fread_fstyp, + AC_CACHE_VAL([fu_cv_sys_mounted_fread_fstyp], [AC_TRY_CPP([ #include <sys/statfs.h> #include <sys/fstyp.h> #include <mnttab.h>], fu_cv_sys_mounted_fread_fstyp=yes, fu_cv_sys_mounted_fread_fstyp=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_fread_fstyp) + AC_MSG_RESULT([$fu_cv_sys_mounted_fread_fstyp]) if test $fu_cv_sys_mounted_fread_fstyp = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_FREAD_FSTYP, 1, + AC_DEFINE([MOUNTED_FREAD_FSTYP], [1], [Define if (like SVR2) there is no specific function for reading the list of mounted file systems, and your system has these header files: <sys/fstyp.h> and <sys/statfs.h>. (SVR3)]) @@ -226,16 +225,16 @@ fi if test -z "$ac_list_mounted_fs"; then # 4.4BSD and DEC OSF/1. AC_MSG_CHECKING([for getmntinfo function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo, + AC_CACHE_VAL([fu_cv_sys_mounted_getmntinfo], [ test "$ac_cv_func_getmntinfo" = yes \ && fu_cv_sys_mounted_getmntinfo=yes \ || fu_cv_sys_mounted_getmntinfo=no ]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmntinfo) + AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo]) if test $fu_cv_sys_mounted_getmntinfo = yes; then AC_MSG_CHECKING([whether getmntinfo returns statvfs structures]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmntinfo2, + AC_CACHE_VAL([fu_cv_sys_mounted_getmntinfo2], [ AC_TRY_COMPILE([ #if HAVE_SYS_PARAM_H @@ -256,13 +255,13 @@ extern int getmntinfo (struct statfs **, int); AC_MSG_RESULT([$fu_cv_sys_mounted_getmntinfo2]) if test $fu_cv_sys_mounted_getmntinfo2 = no; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTINFO, 1, + AC_DEFINE([MOUNTED_GETMNTINFO], [1], [Define if there is a function named getmntinfo for reading the list of mounted file systems and it returns an array of 'struct statfs'. (4.4BSD, Darwin)]) else ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNTINFO2, 1, + AC_DEFINE([MOUNTED_GETMNTINFO2], [1], [Define if there is a function named getmntinfo for reading the list of mounted file systems and it returns an array of 'struct statvfs'. (NetBSD 3.0)]) @@ -273,16 +272,16 @@ fi if test -z "$ac_list_mounted_fs"; then # Ultrix AC_MSG_CHECKING([for getmnt function]) - AC_CACHE_VAL(fu_cv_sys_mounted_getmnt, + AC_CACHE_VAL([fu_cv_sys_mounted_getmnt], [AC_TRY_CPP([ #include <sys/fs_types.h> #include <sys/mount.h>], fu_cv_sys_mounted_getmnt=yes, fu_cv_sys_mounted_getmnt=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_getmnt) + AC_MSG_RESULT([$fu_cv_sys_mounted_getmnt]) if test $fu_cv_sys_mounted_getmnt = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_GETMNT, 1, + AC_DEFINE([MOUNTED_GETMNT], [1], [Define if there is a function named getmnt for reading the list of mounted file systems. (Ultrix)]) fi @@ -290,8 +289,8 @@ fi if test -z "$ac_list_mounted_fs"; then # BeOS - AC_CHECK_FUNCS(next_dev fs_stat_dev) - AC_CHECK_HEADERS(fs_info.h) + AC_CHECK_FUNCS([next_dev fs_stat_dev]) + AC_CHECK_HEADERS([fs_info.h]) AC_MSG_CHECKING([for BEOS mounted file system support functions]) if test $ac_cv_header_fs_info_h = yes \ && test $ac_cv_func_next_dev = yes \ @@ -300,10 +299,10 @@ if test -z "$ac_list_mounted_fs"; then else fu_result=no fi - AC_MSG_RESULT($fu_result) + AC_MSG_RESULT([$fu_result]) if test $fu_result = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_FS_STAT_DEV, 1, + AC_DEFINE([MOUNTED_FS_STAT_DEV], [1], [Define if there are functions named next_dev and fs_stat_dev for reading the list of mounted file systems. (BeOS)]) fi @@ -312,14 +311,14 @@ fi if test -z "$ac_list_mounted_fs"; then # SVR2 AC_MSG_CHECKING([whether it is possible to resort to fread on /etc/mnttab]) - AC_CACHE_VAL(fu_cv_sys_mounted_fread, + AC_CACHE_VAL([fu_cv_sys_mounted_fread], [AC_TRY_CPP([#include <mnttab.h>], fu_cv_sys_mounted_fread=yes, fu_cv_sys_mounted_fread=no)]) - AC_MSG_RESULT($fu_cv_sys_mounted_fread) + AC_MSG_RESULT([$fu_cv_sys_mounted_fread]) if test $fu_cv_sys_mounted_fread = yes; then ac_list_mounted_fs=found - AC_DEFINE(MOUNTED_FREAD, 1, + AC_DEFINE([MOUNTED_FREAD], [1], [Define if there is no specific function for reading the list of mounted file systems. fread will be used to read /etc/mnttab. (SVR2) ]) diff --git a/m4/lstat.m4 b/m4/lstat.m4 index fc222e286e..74c78fe48a 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,7 +1,6 @@ -#serial 18 +# serial 19 -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1997-2001, 2003-2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +16,7 @@ AC_DEFUN([gl_FUNC_LSTAT], AC_CHECK_FUNCS_ONCE([lstat]) if test $ac_cv_func_lstat = yes; then AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK - dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ(lstat). + dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]). if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then REPLACE_LSTAT=1 fi diff --git a/m4/malloc.m4 b/m4/malloc.m4 index 764f2a9fa1..807017166b 100644 --- a/m4/malloc.m4 +++ b/m4/malloc.m4 @@ -1,5 +1,5 @@ -# malloc.m4 serial 8 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# malloc.m4 serial 9 +dnl Copyright (C) 2007, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MALLOC_POSIX], AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix = yes; then HAVE_MALLOC_POSIX=1 - AC_DEFINE([HAVE_MALLOC_POSIX], 1, + AC_DEFINE([HAVE_MALLOC_POSIX], [1], [Define if the 'malloc' function is POSIX compliant.]) else AC_LIBOBJ([malloc]) diff --git a/m4/mathl.m4 b/m4/mathl.m4 index 5d82466203..2a96a0d347 100644 --- a/m4/mathl.m4 +++ b/m4/mathl.m4 @@ -1,12 +1,12 @@ -# mathl.m4 serial 4 -dnl Copyright (c) 2003, 2007 Free Software Foundation, Inc. +# mathl.m4 serial 5 +dnl Copyright (c) 2003, 2007, 2009 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. AC_DEFUN([gl_FUNC_LONG_DOUBLE_MATH], [ -AC_CHECK_LIB(m, atan) +AC_CHECK_LIB([m], [atan]) AC_REPLACE_FUNCS(floorl ceill sqrtl asinl acosl atanl \ logl expl tanl sinl cosl) diff --git a/m4/mbrtowc.m4 b/m4/mbrtowc.m4 index da0d426f06..726497b6cf 100644 --- a/m4/mbrtowc.m4 +++ b/m4/mbrtowc.m4 @@ -1,5 +1,5 @@ -# mbrtowc.m4 serial 12 -dnl Copyright (C) 2001-2002, 2004-2005, 2008 Free Software Foundation, Inc. +# mbrtowc.m4 serial 13 +dnl Copyright (C) 2001-2002, 2004-2005, 2008, 2009 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. @@ -318,7 +318,7 @@ AC_DEFUN([AC_FUNC_MBRTOWC], gl_cv_func_mbrtowc=yes, gl_cv_func_mbrtowc=no)]) if test $gl_cv_func_mbrtowc = yes; then - AC_DEFINE([HAVE_MBRTOWC], 1, + AC_DEFINE([HAVE_MBRTOWC], [1], [Define to 1 if mbrtowc and mbstate_t are properly declared.]) fi ]) diff --git a/m4/mbstate_t.m4 b/m4/mbstate_t.m4 index d2153d9bcd..d4ec6f0fc7 100644 --- a/m4/mbstate_t.m4 +++ b/m4/mbstate_t.m4 @@ -1,5 +1,5 @@ -# mbstate_t.m4 serial 11 -dnl Copyright (C) 2000-2002, 2008 Free Software Foundation, Inc. +# mbstate_t.m4 serial 12 +dnl Copyright (C) 2000-2002, 2008, 2009 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,7 +16,7 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], [ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) dnl for HP-UX 11.11 - AC_CACHE_CHECK([for mbstate_t], ac_cv_type_mbstate_t, + AC_CACHE_CHECK([for mbstate_t], [ac_cv_type_mbstate_t], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( [AC_INCLUDES_DEFAULT[ @@ -25,10 +25,10 @@ AC_DEFUN([AC_TYPE_MBSTATE_T], [ac_cv_type_mbstate_t=yes], [ac_cv_type_mbstate_t=no])]) if test $ac_cv_type_mbstate_t = yes; then - AC_DEFINE([HAVE_MBSTATE_T], 1, + AC_DEFINE([HAVE_MBSTATE_T], [1], [Define to 1 if <wchar.h> declares mbstate_t.]) else - AC_DEFINE([mbstate_t], int, + AC_DEFINE([mbstate_t], [int], [Define to a type if <wchar.h> does not define.]) fi ]) diff --git a/m4/mbswidth.m4 b/m4/mbswidth.m4 index 82ebe44250..2fda87bc4a 100644 --- a/m4/mbswidth.m4 +++ b/m4/mbswidth.m4 @@ -1,5 +1,5 @@ -# mbswidth.m4 serial 15 -dnl Copyright (C) 2000-2002, 2004, 2006-2008 Free Software Foundation, Inc. +# mbswidth.m4 serial 16 +dnl Copyright (C) 2000-2002, 2004, 2006-2009 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. @@ -35,7 +35,7 @@ AC_DEFUN([gl_MBSWIDTH], else ac_val=0 fi - AC_DEFINE_UNQUOTED(HAVE_DECL_MBSWIDTH_IN_WCHAR_H, $ac_val, + AC_DEFINE_UNQUOTED([HAVE_DECL_MBSWIDTH_IN_WCHAR_H], [$ac_val], [Define to 1 if you have a declaration of mbswidth() in <wchar.h>, and to 0 otherwise.]) AC_TYPE_MBSTATE_T diff --git a/m4/memchr.m4 b/m4/memchr.m4 index 91b8636eb8..53c5380281 100644 --- a/m4/memchr.m4 +++ b/m4/memchr.m4 @@ -1,12 +1,12 @@ -# memchr.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +# memchr.m4 serial 5 +dnl Copyright (C) 2002, 2003, 2004, 2009 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. AC_DEFUN([gl_FUNC_MEMCHR], [ - AC_REPLACE_FUNCS(memchr) + AC_REPLACE_FUNCS([memchr]) if test $ac_cv_func_memchr = no; then gl_PREREQ_MEMCHR fi @@ -14,5 +14,5 @@ AC_DEFUN([gl_FUNC_MEMCHR], # Prerequisites of lib/memchr.c. AC_DEFUN([gl_PREREQ_MEMCHR], [ - AC_CHECK_HEADERS(bp-sym.h) + AC_CHECK_HEADERS([bp-sym.h]) ]) diff --git a/m4/memcmp.m4 b/m4/memcmp.m4 index c995a32987..171f4144f7 100644 --- a/m4/memcmp.m4 +++ b/m4/memcmp.m4 @@ -1,5 +1,5 @@ -# memcmp.m4 serial 13 -dnl Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. +# memcmp.m4 serial 14 +dnl Copyright (C) 2002-2004, 2007-2009 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. @@ -19,9 +19,9 @@ AC_DEFUN([gl_FUNC_MEMCMP], [ac_cv_func_memcmp_working=no])]) fi AC_FUNC_MEMCMP - dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp). + dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ([memcmp]). if test $ac_cv_func_memcmp_working = no; then - AC_DEFINE(memcmp, rpl_memcmp, + AC_DEFINE([memcmp], [rpl_memcmp], [Define to rpl_memcmp if the replacement function should be used.]) gl_PREREQ_MEMCMP fi diff --git a/m4/memcpy.m4 b/m4/memcpy.m4 index 3edc62e466..7056f5edba 100644 --- a/m4/memcpy.m4 +++ b/m4/memcpy.m4 @@ -1,12 +1,12 @@ -# memcpy.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# memcpy.m4 serial 3 +dnl Copyright (C) 2002, 2009 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. AC_DEFUN([gl_FUNC_MEMCPY], [ - AC_REPLACE_FUNCS(memcpy) + AC_REPLACE_FUNCS([memcpy]) if test $ac_cv_func_memcpy = no; then gl_PREREQ_MEMCPY fi diff --git a/m4/memmem.m4 b/m4/memmem.m4 index 87ab66319f..9e3d3d956d 100644 --- a/m4/memmem.m4 +++ b/m4/memmem.m4 @@ -1,5 +1,5 @@ -# memmem.m4 serial 13 -dnl Copyright (C) 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. +# memmem.m4 serial 14 +dnl Copyright (C) 2002, 2003, 2004, 2007, 2008, 2009 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. @@ -11,8 +11,8 @@ AC_DEFUN([gl_FUNC_MEMMEM_SIMPLE], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(memmem) - AC_CHECK_DECLS_ONCE(memmem) + AC_REPLACE_FUNCS([memmem]) + AC_CHECK_DECLS_ONCE([memmem]) if test $ac_cv_have_decl_memmem = no; then HAVE_DECL_MEMMEM=0 fi diff --git a/m4/memmove.m4 b/m4/memmove.m4 index 66054e4416..0b01cc6c0c 100644 --- a/m4/memmove.m4 +++ b/m4/memmove.m4 @@ -1,12 +1,12 @@ -# memmove.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# memmove.m4 serial 3 +dnl Copyright (C) 2002, 2009 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. AC_DEFUN([gl_FUNC_MEMMOVE], [ - AC_REPLACE_FUNCS(memmove) + AC_REPLACE_FUNCS([memmove]) if test $ac_cv_func_memmove = no; then gl_PREREQ_MEMMOVE fi diff --git a/m4/mempcpy.m4 b/m4/mempcpy.m4 index d1a12ebfdc..a3c022f70b 100644 --- a/m4/mempcpy.m4 +++ b/m4/mempcpy.m4 @@ -1,5 +1,5 @@ -# mempcpy.m4 serial 9 -dnl Copyright (C) 2003, 2004, 2006, 2007 Free Software Foundation, Inc. +# mempcpy.m4 serial 10 +dnl Copyright (C) 2003-2004, 2006-2007, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_MEMPCPY], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(mempcpy) + AC_REPLACE_FUNCS([mempcpy]) if test $ac_cv_func_mempcpy = no; then HAVE_MEMPCPY=0 gl_PREREQ_MEMPCPY diff --git a/m4/memrchr.m4 b/m4/memrchr.m4 index 8070d5fece..b74de75afa 100644 --- a/m4/memrchr.m4 +++ b/m4/memrchr.m4 @@ -1,5 +1,5 @@ -# memrchr.m4 serial 8 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# memrchr.m4 serial 9 +dnl Copyright (C) 2002, 2003, 2005, 2006, 2007, 2009 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. @@ -15,7 +15,7 @@ AC_DEFUN([gl_FUNC_MEMRCHR], HAVE_DECL_MEMRCHR=0 fi - AC_REPLACE_FUNCS(memrchr) + AC_REPLACE_FUNCS([memrchr]) if test $ac_cv_func_memrchr = no; then gl_PREREQ_MEMRCHR fi diff --git a/m4/memset.m4 b/m4/memset.m4 index 14ac2678e3..38609dc677 100644 --- a/m4/memset.m4 +++ b/m4/memset.m4 @@ -1,12 +1,12 @@ -# memset.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# memset.m4 serial 3 +dnl Copyright (C) 2002, 2009 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. AC_DEFUN([gl_FUNC_MEMSET], [ - AC_REPLACE_FUNCS(memset) + AC_REPLACE_FUNCS([memset]) if test $ac_cv_func_memset = no; then gl_PREREQ_MEMSET fi diff --git a/m4/minmax.m4 b/m4/minmax.m4 index bbd1ba0b84..d2993fbaf7 100644 --- a/m4/minmax.m4 +++ b/m4/minmax.m4 @@ -1,10 +1,10 @@ -# minmax.m4 serial 2 -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# minmax.m4 serial 3 +dnl Copyright (C) 2005, 2009 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. -AC_PREREQ(2.52) +AC_PREREQ([2.52]) AC_DEFUN([gl_MINMAX], [ diff --git a/m4/mkdir-slash.m4 b/m4/mkdir-slash.m4 index f3d8e8a576..4e56bda718 100644 --- a/m4/mkdir-slash.m4 +++ b/m4/mkdir-slash.m4 @@ -1,6 +1,6 @@ -#serial 6 +# serial 7 -# Copyright (C) 2001, 2003, 2004, 2006, 2008 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003-2004, 2006, 2008-2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_MKDIR_TRAILING_SLASH], [dnl AC_REQUIRE([gl_SYS_STAT_H_DEFAULTS]) - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CACHE_CHECK([whether mkdir fails due to a trailing slash], gl_cv_func_mkdir_trailing_slash_bug, [ @@ -39,7 +39,7 @@ AC_DEFUN([gl_FUNC_MKDIR_TRAILING_SLASH], if test $gl_cv_func_mkdir_trailing_slash_bug = yes; then REPLACE_MKDIR=1 - AC_LIBOBJ(mkdir) + AC_LIBOBJ([mkdir]) gl_PREREQ_MKDIR fi ]) diff --git a/m4/mkdtemp.m4 b/m4/mkdtemp.m4 index 0eeafbc9a6..444b61837c 100644 --- a/m4/mkdtemp.m4 +++ b/m4/mkdtemp.m4 @@ -1,5 +1,5 @@ -# mkdtemp.m4 serial 5 -dnl Copyright (C) 2001-2003, 2006-2007 Free Software Foundation, Inc. +# mkdtemp.m4 serial 6 +dnl Copyright (C) 2001-2003, 2006-2007, 2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gt_FUNC_MKDTEMP], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REPLACE_FUNCS(mkdtemp) + AC_REPLACE_FUNCS([mkdtemp]) if test $ac_cv_func_mkdtemp = no; then HAVE_MKDTEMP=0 gl_PREREQ_MKDTEMP diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 5faf3935e9..cc792af29e 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,5 +1,5 @@ -#serial 13 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# serial 14 +dnl Copyright (C) 2002-2003, 2005-2007, 2009 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. @@ -13,9 +13,9 @@ dnl From Jim Meyering. # AC_FUNC_MKTIME # -------------- AC_DEFUN([AC_FUNC_MKTIME], -[AC_CHECK_HEADERS_ONCE(unistd.h) -AC_CHECK_FUNCS_ONCE(alarm) -AC_CACHE_CHECK([for working mktime], ac_cv_func_working_mktime, +[AC_CHECK_HEADERS_ONCE([unistd.h]) +AC_CHECK_FUNCS_ONCE([alarm]) +AC_CACHE_CHECK([for working mktime], [ac_cv_func_working_mktime], [AC_RUN_IFELSE([AC_LANG_SOURCE( [[/* Test program from Paul Eggert and Tony Leneis. */ #include <limits.h> @@ -212,9 +212,9 @@ fi AC_DEFUN([gl_FUNC_MKTIME], [ AC_FUNC_MKTIME - dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ(mktime). + dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ([mktime]). if test $ac_cv_func_working_mktime = no; then - AC_DEFINE(mktime, rpl_mktime, + AC_DEFINE([mktime], [rpl_mktime], [Define to rpl_mktime if the replacement function should be used.]) gl_PREREQ_MKTIME fi diff --git a/m4/mmap-anon.m4 b/m4/mmap-anon.m4 index 13fbd3c491..025c904e41 100644 --- a/m4/mmap-anon.m4 +++ b/m4/mmap-anon.m4 @@ -1,5 +1,5 @@ -# mmap-anon.m4 serial 4 -dnl Copyright (C) 2005, 2007 Free Software Foundation, Inc. +# mmap-anon.m4 serial 5 +dnl Copyright (C) 2005, 2007, 2009 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. @@ -34,13 +34,13 @@ AC_DEFUN([gl_FUNC_MMAP_ANON], I cant identify this map. #endif ], - [AC_DEFINE(MAP_ANONYMOUS, MAP_ANON, + [AC_DEFINE([MAP_ANONYMOUS], [MAP_ANON], [Define to a substitute value for mmap()'s MAP_ANONYMOUS flag.]) gl_have_mmap_anonymous=yes]) fi - AC_MSG_RESULT($gl_have_mmap_anonymous) + AC_MSG_RESULT([$gl_have_mmap_anonymous]) if test $gl_have_mmap_anonymous = yes; then - AC_DEFINE(HAVE_MAP_ANONYMOUS, 1, + AC_DEFINE([HAVE_MAP_ANONYMOUS], [1], [Define to 1 if mmap()'s MAP_ANONYMOUS flag is available after including config.h and <sys/mman.h>.]) fi diff --git a/m4/mountlist.m4 b/m4/mountlist.m4 index c25f44e7e2..f62c57a23b 100644 --- a/m4/mountlist.m4 +++ b/m4/mountlist.m4 @@ -1,5 +1,5 @@ -#serial 9 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# serial 10 +dnl Copyright (C) 2002-2006, 2009 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_MOUNTLIST], gl_LIST_MOUNTED_FILE_SYSTEMS([gl_cv_list_mounted_fs=yes], [gl_cv_list_mounted_fs=no]) if test $gl_cv_list_mounted_fs = yes; then - AC_LIBOBJ(mountlist) + AC_LIBOBJ([mountlist]) gl_PREREQ_MOUNTLIST_EXTRA fi ]) @@ -18,6 +18,6 @@ AC_DEFUN([gl_MOUNTLIST], AC_DEFUN([gl_PREREQ_MOUNTLIST_EXTRA], [ dnl Note gl_LIST_MOUNTED_FILE_SYSTEMS checks for mntent.h, not sys/mntent.h. - AC_CHECK_HEADERS(sys/mntent.h) + AC_CHECK_HEADERS([sys/mntent.h]) gl_FSTYPENAME ]) diff --git a/m4/nanosleep.m4 b/m4/nanosleep.m4 index d5248a7aa9..ba54130bc0 100644 --- a/m4/nanosleep.m4 +++ b/m4/nanosleep.m4 @@ -1,12 +1,11 @@ -#serial 25 +# serial 26 dnl From Jim Meyering. dnl Check for the nanosleep function. dnl If not found, use the supplied replacement. dnl -# Copyright (C) 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007, 2008 -# Free Software Foundation, Inc. +# Copyright (C) 1999-2001, 2003-2009 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -19,7 +18,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_REQUIRE([gl_CLOCK_TIME]) - AC_CHECK_HEADERS_ONCE(sys/time.h) + AC_CHECK_HEADERS_ONCE([sys/time.h]) nanosleep_save_libs=$LIBS @@ -91,7 +90,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], else REPLACE_NANOSLEEP=1 if test "$gl_cv_func_nanosleep" = 'no (mishandles large arguments)'; then - AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], 1, + AC_DEFINE([HAVE_BUG_BIG_NANOSLEEP], [1], [Define to 1 if nanosleep mishandles large arguments.]) for ac_lib in $LIB_CLOCK_GETTIME; do case " $LIB_NANOSLEEP " in @@ -100,7 +99,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], esac done fi - AC_LIBOBJ(nanosleep) + AC_LIBOBJ([nanosleep]) gl_PREREQ_NANOSLEEP fi @@ -111,6 +110,6 @@ AC_DEFUN([gl_FUNC_NANOSLEEP], # Prerequisites of lib/nanosleep.c. AC_DEFUN([gl_PREREQ_NANOSLEEP], [ - AC_CHECK_HEADERS_ONCE(sys/select.h) + AC_CHECK_HEADERS_ONCE([sys/select.h]) gl_PREREQ_SIG_HANDLER_H ]) @@ -1,5 +1,5 @@ -# nls.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 1995-2003, 2005-2006, 2008 Free Software Foundation, Inc. +# nls.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 1995-2003, 2005-2006, 2008, 2009 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. @@ -17,15 +17,15 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) AC_DEFUN([AM_NLS], [ AC_MSG_CHECKING([whether NLS is requested]) dnl Default is enabled NLS - AC_ARG_ENABLE(nls, + AC_ARG_ENABLE([nls], [ --disable-nls do not use Native Language Support], USE_NLS=$enableval, USE_NLS=yes) - AC_MSG_RESULT($USE_NLS) + AC_MSG_RESULT([$USE_NLS]) AC_SUBST([USE_NLS]) ]) diff --git a/m4/nocrash.m4 b/m4/nocrash.m4 index 1f92c26d90..8626ea0b0b 100644 --- a/m4/nocrash.m4 +++ b/m4/nocrash.m4 @@ -1,12 +1,12 @@ -# nocrash.m4 serial 1 -dnl Copyright (C) 2005 Free Software Foundation, Inc. +# nocrash.m4 serial 2 +dnl Copyright (C) 2005, 2009 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. dnl Based on libsigsegv, from Bruno Haible and Paolo Bonzini. -AC_PREREQ(2.13) +AC_PREREQ([2.13]) dnl Expands to some code for use in .c programs that will cause the configure dnl test to exit instead of crashing. This is useful to avoid triggering diff --git a/m4/open.m4 b/m4/open.m4 index 38dfa26041..6e286c96e8 100644 --- a/m4/open.m4 +++ b/m4/open.m4 @@ -1,5 +1,5 @@ -# open.m4 serial 4 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# open.m4 serial 5 +dnl Copyright (C) 2007-2009 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. @@ -39,7 +39,7 @@ changequote([,])dnl ]) case "$gl_cv_func_open_slash" in *no) - AC_DEFINE([OPEN_TRAILING_SLASH_BUG], 1, + AC_DEFINE([OPEN_TRAILING_SLASH_BUG], [1], [Define to 1 if open() fails to recognize a trailing slash.]) gl_REPLACE_OPEN ;; diff --git a/m4/openat.m4 b/m4/openat.m4 index 3b5b7cafe1..10eac5c12e 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,7 +1,7 @@ -#serial 16 +# serial 17 # See if we need to use our replacement for Solaris' openat et al functions. -dnl Copyright (C) 2004, 2005, 2006, 2007, 2008 Free Software Foundation, Inc. +dnl Copyright (C) 2004-2009 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. @@ -79,8 +79,8 @@ AC_DEFUN([gl_FUNC_FCHOWNAT], fi if test $use_replacement_fchownat = yes; then - AC_LIBOBJ(fchownat) - AC_DEFINE(fchownat, rpl_fchownat, + AC_LIBOBJ([fchownat]) + AC_DEFINE([fchownat], [rpl_fchownat], [Define to rpl_fchownat if the replacement function should be used.]) fi ]) diff --git a/m4/openmp.m4 b/m4/openmp.m4 index ba84ea0eb3..8c9c06f1ae 100644 --- a/m4/openmp.m4 +++ b/m4/openmp.m4 @@ -1,5 +1,5 @@ -# openmp.m4 serial 5 -dnl Copyright (C) 2006-2008 Free Software Foundation, Inc. +# openmp.m4 serial 6 +dnl Copyright (C) 2006-2009 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. @@ -15,11 +15,11 @@ m4_ifdef([AC_OPENMP], [], [ # Expands to some language dependent source code for testing the presence of # OpenMP. AC_DEFUN([_AC_LANG_OPENMP], -[_AC_LANG_DISPATCH([$0], _AC_LANG, $@)]) +[_AC_LANG_DISPATCH([$0], [_AC_LANG], [$@])]) # _AC_LANG_OPENMP(C) # ------------------ -m4_define([_AC_LANG_OPENMP(C)], +m4_define([_AC_LANG_OPENMP([C])], [ #ifndef _OPENMP choke me @@ -30,16 +30,16 @@ int main () { return omp_get_num_threads (); } # _AC_LANG_OPENMP(C++) # -------------------- -m4_copy([_AC_LANG_OPENMP(C)], [_AC_LANG_OPENMP(C++)]) +m4_copy([_AC_LANG_OPENMP([C])], [_AC_LANG_OPENMP([C++])]) # _AC_LANG_OPENMP(Fortran 77) # --------------------------- -m4_define([_AC_LANG_OPENMP(Fortran 77)], +m4_define([_AC_LANG_OPENMP([Fortran 77])], [AC_LANG_FUNC_LINK_TRY([omp_get_num_threads])]) # _AC_LANG_OPENMP(Fortran) # --------------------------- -m4_copy([_AC_LANG_OPENMP(Fortran 77)], [_AC_LANG_OPENMP(Fortran)]) +m4_copy([_AC_LANG_OPENMP([Fortran 77])], [_AC_LANG_OPENMP([Fortran])]) # AC_OPENMP # --------- diff --git a/m4/pathmax.m4 b/m4/pathmax.m4 index 64bf26ff75..e88fdb4ca4 100644 --- a/m4/pathmax.m4 +++ b/m4/pathmax.m4 @@ -1,5 +1,5 @@ -# pathmax.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2005, 2006 Free Software Foundation, Inc. +# pathmax.m4 serial 7 +dnl Copyright (C) 2002, 2003, 2005, 2006, 2009 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. @@ -7,5 +7,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_PATHMAX], [ dnl Prerequisites of lib/pathmax.h. - AC_CHECK_HEADERS_ONCE(sys/param.h) + AC_CHECK_HEADERS_ONCE([sys/param.h]) ]) diff --git a/m4/perl.m4 b/m4/perl.m4 index 90c224a87b..eca31b500c 100644 --- a/m4/perl.m4 +++ b/m4/perl.m4 @@ -1,9 +1,9 @@ -#serial 8 +# serial 9 dnl From Jim Meyering. dnl Find a new-enough version of Perl. -# Copyright (C) 1998-2001, 2003, 2004, 2007 Free Software Foundation, Inc. +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -23,7 +23,7 @@ AC_DEFUN([gl_PERL], fi found=no - AC_SUBST(PERL) + AC_SUBST([PERL]) PERL="$am_missing_run perl" for perl in $candidate_perl_names; do # Run test in a subshell; some versions of sh will print an error if @@ -35,7 +35,7 @@ AC_DEFUN([gl_PERL], fi done - AC_MSG_RESULT($found) + AC_MSG_RESULT([$found]) test $found = no && AC_MSG_WARN([ WARNING: You don't seem to have perl5.005 or newer installed, or you lack a usable version of the Perl File::Compare module. As a result, diff --git a/m4/physmem.m4 b/m4/physmem.m4 index b5001e1fc9..2d79a69972 100644 --- a/m4/physmem.m4 +++ b/m4/physmem.m4 @@ -1,5 +1,5 @@ -# physmem.m4 serial 8 -dnl Copyright (C) 2002-2003, 2005-2006, 2008 Free Software Foundation, Inc. +# physmem.m4 serial 9 +dnl Copyright (C) 2002-2003, 2005-2006, 2008-2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. # Check for the external symbol, _system_configuration, # a struct with member `physmem'. AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION], - [AC_CACHE_CHECK(for external symbol _system_configuration, + [AC_CACHE_CHECK([for external symbol _system_configuration], gl_cv_var__system_configuration, [AC_LINK_IFELSE([AC_LANG_PROGRAM( [[#include <sys/systemcfg.h> @@ -18,7 +18,7 @@ AC_DEFUN([gl_SYS__SYSTEM_CONFIGURATION], [gl_cv_var__system_configuration=no])]) if test $gl_cv_var__system_configuration = yes; then - AC_DEFINE(HAVE__SYSTEM_CONFIGURATION, 1, + AC_DEFINE([HAVE__SYSTEM_CONFIGURATION], [1], [Define to 1 if you have the external variable, _system_configuration with a member named physmem.]) fi @@ -34,6 +34,6 @@ AC_DEFUN([gl_PHYSMEM], machine/hal_sysinfo.h sys/table.h sys/param.h sys/sysctl.h \ sys/systemcfg.h],,, [AC_INCLUDES_DEFAULT]) - AC_CHECK_FUNCS(pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table) + AC_CHECK_FUNCS([pstat_getstatic pstat_getdynamic sysmp getsysinfo sysctl table]) AC_REQUIRE([gl_SYS__SYSTEM_CONFIGURATION]) ]) diff --git a/m4/pipe.m4 b/m4/pipe.m4 index 12da48fd1a..83f2868094 100644 --- a/m4/pipe.m4 +++ b/m4/pipe.m4 @@ -1,5 +1,5 @@ -# pipe.m4 serial 2 -dnl Copyright (C) 2004, 2008 Free Software Foundation, Inc. +# pipe.m4 serial 3 +dnl Copyright (C) 2004, 2008, 2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_PIPE], [ dnl Prerequisites of lib/pipe.h. - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) dnl Prerequisites of lib/pipe.c. AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_TYPE_MODE_T]) @@ -16,7 +16,7 @@ AC_DEFUN([gl_PIPE], [gl_POSIX_SPAWN_WORKS case "$gl_cv_func_posix_spawn_works" in *yes) - AC_DEFINE([HAVE_POSIX_SPAWN], 1, + AC_DEFINE([HAVE_POSIX_SPAWN], [1], [Define if you have the posix_spawn() function and it works.]) ;; esac @@ -1,5 +1,5 @@ -# po.m4 serial 16 (gettext-0.18) -dnl Copyright (C) 1995-2008 Free Software Foundation, Inc. +# po.m4 serial 17 (gettext-0.18) +dnl Copyright (C) 1995-2009 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. @@ -17,7 +17,7 @@ dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1995-2000. dnl Bruno Haible <haible@clisp.cons.org>, 2000-2003. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) dnl Checks for all prerequisites of the po subdirectory. AC_DEFUN([AM_PO_SUBDIRS], diff --git a/m4/poll.m4 b/m4/poll.m4 index bb610dadd0..a16e3769fb 100644 --- a/m4/poll.m4 +++ b/m4/poll.m4 @@ -1,16 +1,16 @@ -# poll.m4 serial 7 -dnl Copyright (c) 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# poll.m4 serial 8 +dnl Copyright (c) 2003, 2005, 2006, 2007, 2009 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. AC_DEFUN([gl_FUNC_POLL], [ - AC_CHECK_HEADERS(poll.h) + AC_CHECK_HEADERS([poll.h]) if test "$ac_cv_header_poll_h" = no; then gl_cv_func_poll=no else - AC_CHECK_FUNC(poll, + AC_CHECK_FUNC([poll], [# Check whether poll() works on special files (like /dev/null) and # and ttys (like /dev/tty). On MacOS X 10.4.0 and AIX 5.3, it doesn't. AC_TRY_RUN([ @@ -51,12 +51,12 @@ This is MacOSX or AIX ], [gl_cv_func_poll=no], [gl_cv_func_poll=yes])])]) fi if test $gl_cv_func_poll = yes; then - AC_DEFINE([HAVE_POLL], 1, + AC_DEFINE([HAVE_POLL], [1], [Define to 1 if you have the 'poll' function and it works.]) POLL_H= else - AC_LIBOBJ(poll) - AC_DEFINE(poll, rpl_poll, + AC_LIBOBJ([poll]) + AC_DEFINE([poll], [rpl_poll], [Define to poll if the replacement function should be used.]) gl_PREREQ_POLL POLL_H=poll.h @@ -67,5 +67,5 @@ This is MacOSX or AIX # Prerequisites of lib/poll.c. AC_DEFUN([gl_PREREQ_POLL], [ - AC_CHECK_HEADERS_ONCE(sys/ioctl.h sys/filio.h) + AC_CHECK_HEADERS_ONCE([sys/ioctl.h sys/filio.h]) ]) diff --git a/m4/posixtm.m4 b/m4/posixtm.m4 index 7ace2a9655..c795e54fbf 100644 --- a/m4/posixtm.m4 +++ b/m4/posixtm.m4 @@ -1,12 +1,12 @@ -# posixtm.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. +# posixtm.m4 serial 7 +dnl Copyright (C) 2002-2003, 2005-2007, 2009 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. AC_DEFUN([gl_POSIXTM], [ - AC_LIBOBJ(posixtm) + AC_LIBOBJ([posixtm]) dnl No prerequisites of lib/posixtm.c. ]) diff --git a/m4/posixver.m4 b/m4/posixver.m4 index f60a094802..4f818ed036 100644 --- a/m4/posixver.m4 +++ b/m4/posixver.m4 @@ -1,5 +1,5 @@ -# posixver.m4 serial 9 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# posixver.m4 serial 10 +dnl Copyright (C) 2002-2006, 2009 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. @@ -23,7 +23,7 @@ AC_DEFUN([gl_DEFAULT_POSIX2_VERSION], gl_default_posix2_version=none-specified if test -n "$ac_cv_env_DEFAULT_POSIX2_VERSION_set"; then gl_default_posix2_version=$ac_cv_env_DEFAULT_POSIX2_VERSION_value - AC_DEFINE_UNQUOTED(DEFAULT_POSIX2_VERSION, + AC_DEFINE_UNQUOTED([DEFAULT_POSIX2_VERSION], $gl_default_posix2_version, [Define the default level of POSIX conformance. The value is of the form YYYYMM, specifying the year and month the standard was @@ -38,7 +38,7 @@ AC_DEFUN([gl_DEFAULT_POSIX2_VERSION], overridden at run time via the _POSIX2_VERSION environment variable.]) fi - AC_MSG_RESULT($gl_default_posix2_version) + AC_MSG_RESULT([$gl_default_posix2_version]) AC_ARG_VAR( [DEFAULT_POSIX2_VERSION], [POSIX version to default to; see 'config.hin'.]) diff --git a/m4/printf-frexp.m4 b/m4/printf-frexp.m4 index d94e1ad103..fa0aa1583b 100644 --- a/m4/printf-frexp.m4 +++ b/m4/printf-frexp.m4 @@ -1,5 +1,5 @@ -# printf-frexp.m4 serial 2 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# printf-frexp.m4 serial 3 +dnl Copyright (C) 2007, 2009 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,7 +22,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXP], gl_FUNC_FREXP_WORKS case "$gl_cv_func_frexp_works" in *yes) - AC_DEFINE([HAVE_FREXP_IN_LIBC], 1, + AC_DEFINE([HAVE_FREXP_IN_LIBC], [1], [Define if the frexp function is available in libc.]) ;; esac @@ -39,7 +39,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXP], [gl_cv_func_ldexp_no_libm=no]) ]) if test $gl_cv_func_ldexp_no_libm = yes; then - AC_DEFINE([HAVE_LDEXP_IN_LIBC], 1, + AC_DEFINE([HAVE_LDEXP_IN_LIBC], [1], [Define if the ldexp function is available in libc.]) fi ]) diff --git a/m4/printf-frexpl.m4 b/m4/printf-frexpl.m4 index 669cc26014..f2eb2004bc 100644 --- a/m4/printf-frexpl.m4 +++ b/m4/printf-frexpl.m4 @@ -1,5 +1,5 @@ -# printf-frexpl.m4 serial 5 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# printf-frexpl.m4 serial 6 +dnl Copyright (C) 2007, 2009 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_FUNC_PRINTF_FREXPL], REPLACE_FREXPL=1 fi if test $gl_func_frexpl_no_libm = yes; then - AC_DEFINE([HAVE_FREXPL_IN_LIBC], 1, + AC_DEFINE([HAVE_FREXPL_IN_LIBC], [1], [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>. @@ -53,7 +53,7 @@ AC_DEFUN([gl_FUNC_PRINTF_FREXPL], gl_FUNC_LDEXPL_WORKS case "$gl_cv_func_ldexpl_works" in *yes) - AC_DEFINE([HAVE_LDEXPL_IN_LIBC], 1, + AC_DEFINE([HAVE_LDEXPL_IN_LIBC], [1], [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>. diff --git a/m4/printf-posix-rpl.m4 b/m4/printf-posix-rpl.m4 index f17be16c7d..3106a78f13 100644 --- a/m4/printf-posix-rpl.m4 +++ b/m4/printf-posix-rpl.m4 @@ -1,5 +1,5 @@ -# printf-posix-rpl.m4 serial 2 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# printf-posix-rpl.m4 serial 3 +dnl Copyright (C) 2007-2009 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. @@ -17,7 +17,7 @@ AC_DEFUN([gl_REPLACE_PRINTF], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_LIBOBJ([printf]) REPLACE_PRINTF=1 - AC_DEFINE([REPLACE_PRINTF_POSIX], 1, + AC_DEFINE([REPLACE_PRINTF_POSIX], [1], [Define if printf is overridden by a POSIX compliant gnulib implementation.]) gl_PREREQ_PRINTF ]) diff --git a/m4/printf-posix.m4 b/m4/printf-posix.m4 index 8933ee399d..5922d27891 100644 --- a/m4/printf-posix.m4 +++ b/m4/printf-posix.m4 @@ -1,5 +1,5 @@ -# printf-posix.m4 serial 4 (gettext-0.18) -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# printf-posix.m4 serial 5 (gettext-0.18) +dnl Copyright (C) 2003, 2007, 2009 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. @@ -27,7 +27,7 @@ int main () return (strcmp (buf, "55 33") != 0); }], gt_cv_func_printf_posix=yes, gt_cv_func_printf_posix=no, [ - AC_EGREP_CPP(notposix, [ + AC_EGREP_CPP([notposix], [ #if defined __NetBSD__ || defined __BEOS__ || defined _MSC_VER || defined __MINGW32__ || defined __CYGWIN__ notposix #endif @@ -38,7 +38,7 @@ int main () ]) case $gt_cv_func_printf_posix in *yes) - AC_DEFINE([HAVE_POSIX_PRINTF], 1, + AC_DEFINE([HAVE_POSIX_PRINTF], [1], [Define if your printf() function supports format strings with positions.]) ;; esac diff --git a/m4/printf.m4 b/m4/printf.m4 index 474a635575..4d109935d4 100644 --- a/m4/printf.m4 +++ b/m4/printf.m4 @@ -1,5 +1,5 @@ -# printf.m4 serial 25 -dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc. +# printf.m4 serial 26 +dnl Copyright (C) 2003, 2007-2009 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. @@ -230,7 +230,7 @@ AC_DEFUN([gl_PRINTF_INFINITE_LONG_DOUBLE], dnl The user can set or unset the variable gl_printf_safe to indicate dnl that he wishes a safe handling of non-IEEE-754 'long double' values. if test -n "$gl_printf_safe"; then - AC_DEFINE([CHECK_PRINTF_SAFE], 1, + AC_DEFINE([CHECK_PRINTF_SAFE], [1], [Define if you wish *printf() functions that have a safe handling of non-IEEE-754 'long double' values.]) fi diff --git a/m4/progtest.m4 b/m4/progtest.m4 index 9b55f75120..e1d445d267 100644 --- a/m4/progtest.m4 +++ b/m4/progtest.m4 @@ -1,5 +1,5 @@ -# progtest.m4 serial 5 (gettext-0.18) -dnl Copyright (C) 1996-2003, 2005, 2008 Free Software Foundation, Inc. +# progtest.m4 serial 6 (gettext-0.18) +dnl Copyright (C) 1996-2003, 2005, 2008, 2009 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,7 +16,7 @@ dnl They are *not* in the public domain. dnl Authors: dnl Ulrich Drepper <drepper@cygnus.com>, 1996. -AC_PREREQ(2.50) +AC_PREREQ([2.50]) # Search path for a program which passes the given test. @@ -88,5 +88,5 @@ if test ifelse([$4], , [-n "[$]$1"], ["[$]$1" != "$4"]); then else AC_MSG_RESULT([no]) fi -AC_SUBST($1)dnl +AC_SUBST([$1])dnl ]) diff --git a/m4/putenv.m4 b/m4/putenv.m4 index 17105754c9..120f5a4a52 100644 --- a/m4/putenv.m4 +++ b/m4/putenv.m4 @@ -1,5 +1,5 @@ -# putenv.m4 serial 15 -dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. +# putenv.m4 serial 16 +dnl Copyright (C) 2002-2009 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. @@ -36,6 +36,6 @@ AC_DEFUN([gl_FUNC_PUTENV], ]) if test $gl_cv_func_svid_putenv = no; then REPLACE_PUTENV=1 - AC_LIBOBJ(putenv) + AC_LIBOBJ([putenv]) fi ]) diff --git a/m4/readline.m4 b/m4/readline.m4 index 4c82a7fafe..60b0aa8fb0 100644 --- a/m4/readline.m4 +++ b/m4/readline.m4 @@ -1,5 +1,5 @@ -# readline.m4 serial 5 -dnl Copyright (C) 2005, 2006 Free Software Foundation, Inc. +# readline.m4 serial 6 +dnl Copyright (C) 2005, 2006, 2009 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. @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_READLINE], am_save_CPPFLAGS="$CPPFLAGS" AC_LIB_APPENDTOVAR([CPPFLAGS], [$INCREADLINE]) - AC_CACHE_CHECK(for readline, gl_cv_lib_readline, [ + AC_CACHE_CHECK([for readline], [gl_cv_lib_readline], [ gl_cv_lib_readline=no am_save_LIBS="$LIBS" dnl On some systems, -lreadline doesn't link without an additional @@ -49,7 +49,7 @@ AC_DEFUN([gl_FUNC_READLINE], ]) if test "$gl_cv_lib_readline" != no; then - AC_DEFINE(HAVE_READLINE, 1, [Define if you have the readline library.]) + AC_DEFINE([HAVE_READLINE], [1], [Define if you have the readline library.]) if test "$gl_cv_lib_readline" != " -l"; then LIBREADLINE="$LIBREADLINE$gl_cv_lib_readline" LTLIBREADLINE="$LTLIBREADLINE$gl_cv_lib_readline" @@ -63,13 +63,13 @@ AC_DEFUN([gl_FUNC_READLINE], LIBREADLINE= LTLIBREADLINE= fi - AC_SUBST(LIBREADLINE) - AC_SUBST(LTLIBREADLINE) + AC_SUBST([LIBREADLINE]) + AC_SUBST([LTLIBREADLINE]) - AC_CHECK_HEADERS(readline/readline.h) + AC_CHECK_HEADERS([readline/readline.h]) if test $gl_cv_lib_readline = no; then - AC_LIBOBJ(readline) + AC_LIBOBJ([readline]) gl_PREREQ_READLINE fi ]) diff --git a/m4/readlink.m4 b/m4/readlink.m4 index 1c347a0c9a..ff3f1f5876 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,5 +1,5 @@ -# readlink.m4 serial 4 -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# readlink.m4 serial 5 +dnl Copyright (C) 2003, 2007, 2009 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. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_READLINK], AC_CHECK_FUNCS_ONCE([readlink]) if test $ac_cv_func_readlink = no; then HAVE_READLINK=0 - AC_LIBOBJ(readlink) + AC_LIBOBJ([readlink]) gl_PREREQ_READLINK fi ]) diff --git a/m4/readutmp.m4 b/m4/readutmp.m4 index 6931dc55aa..a88e0fd901 100644 --- a/m4/readutmp.m4 +++ b/m4/readutmp.m4 @@ -1,5 +1,5 @@ -# readutmp.m4 serial 15 -dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. +# readutmp.m4 serial 16 +dnl Copyright (C) 2002-2009 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,14 +9,14 @@ AC_DEFUN([gl_READUTMP], dnl Persuade utmpx.h to declare utmpxname AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) - AC_CHECK_HEADERS_ONCE(utmp.h utmpx.h) + AC_CHECK_HEADERS_ONCE([utmp.h utmpx.h]) if test $ac_cv_header_utmp_h = yes || test $ac_cv_header_utmpx_h = yes; then AC_LIBOBJ([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_FUNCS_ONCE([utmpname utmpxname]) + AC_CHECK_DECLS([getutent],,,[ #ifdef HAVE_UTMP_H # include <utmp.h> #endif diff --git a/m4/realloc.m4 b/m4/realloc.m4 index f9fd935dbb..5925796864 100644 --- a/m4/realloc.m4 +++ b/m4/realloc.m4 @@ -1,5 +1,5 @@ -# realloc.m4 serial 8 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# realloc.m4 serial 9 +dnl Copyright (C) 2007, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_REALLOC_POSIX], AC_REQUIRE([gl_CHECK_MALLOC_POSIX]) if test $gl_cv_func_malloc_posix = yes; then HAVE_REALLOC_POSIX=1 - AC_DEFINE([HAVE_REALLOC_POSIX], 1, + AC_DEFINE([HAVE_REALLOC_POSIX], [1], [Define if the 'realloc' function is POSIX compliant.]) else AC_LIBOBJ([realloc]) diff --git a/m4/regex.m4 b/m4/regex.m4 index f3a7b42b38..43b04638c2 100644 --- a/m4/regex.m4 +++ b/m4/regex.m4 @@ -1,7 +1,7 @@ -#serial 52 +# serial 53 # Copyright (C) 1996, 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, -# 2006, 2007, 2008 Free Software Foundation, Inc. +# 2006, 2007, 2008, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -175,7 +175,7 @@ AC_DEFUN([gl_REGEX], esac if test $ac_use_included_regex = yes; then - AC_DEFINE([_REGEX_LARGE_OFFSETS], 1, + AC_DEFINE([_REGEX_LARGE_OFFSETS], [1], [Define if you want regoff_t to be at least as wide POSIX requires.]) AC_DEFINE([re_syntax_options], [rpl_re_syntax_options], [Define to rpl_re_syntax_options if the replacement should be used.]) diff --git a/m4/relocatable-lib.m4 b/m4/relocatable-lib.m4 index 4c9067769e..fd99cdaef2 100644 --- a/m4/relocatable-lib.m4 +++ b/m4/relocatable-lib.m4 @@ -1,5 +1,5 @@ -# relocatable-lib.m4 serial 3 -dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. +# relocatable-lib.m4 serial 4 +dnl Copyright (C) 2003, 2005-2007, 2009 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. @@ -26,7 +26,7 @@ AC_DEFUN([gl_RELOCATABLE_LIBRARY_BODY], AC_DEFINE_UNQUOTED([INSTALLPREFIX], ["${reloc_final_prefix}"], [Define to the value of ${prefix}, as a string.]) if test $RELOCATABLE = yes; then - AC_DEFINE([ENABLE_RELOCATABLE], 1, + AC_DEFINE([ENABLE_RELOCATABLE], [1], [Define to 1 if the package shall run at any location in the filesystem.]) fi ]) @@ -42,7 +42,7 @@ dnl Support for relocatable packages for which it is a nop. AC_DEFUN([gl_RELOCATABLE_NOP], [ AC_MSG_CHECKING([whether to activate relocatable installation]) - AC_ARG_ENABLE(relocatable, + AC_ARG_ENABLE([relocatable], [ --enable-relocatable install a package that can be moved in the filesystem], [if test "$enableval" != no; then RELOCATABLE=yes @@ -50,7 +50,7 @@ AC_DEFUN([gl_RELOCATABLE_NOP], RELOCATABLE=no fi ], RELOCATABLE=no) - AC_SUBST(RELOCATABLE) + AC_SUBST([RELOCATABLE]) AC_MSG_RESULT([$RELOCATABLE]) ]) diff --git a/m4/relocatable.m4 b/m4/relocatable.m4 index 2907707a5c..1386892a74 100644 --- a/m4/relocatable.m4 +++ b/m4/relocatable.m4 @@ -1,5 +1,5 @@ -# relocatable.m4 serial 12 -dnl Copyright (C) 2003, 2005-2007 Free Software Foundation, Inc. +# relocatable.m4 serial 13 +dnl Copyright (C) 2003, 2005-2007, 2009 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. @@ -88,7 +88,7 @@ AC_DEFUN([AC_LIB_LIBPATH], AC_REQUIRE([AC_LIB_PROG_LD]) dnl we use $LD AC_REQUIRE([AC_CANONICAL_HOST]) dnl we use $host AC_REQUIRE([AC_CONFIG_AUX_DIR_DEFAULT]) dnl we use $ac_aux_dir - AC_CACHE_CHECK([for shared library path variable], acl_cv_libpath, [ + AC_CACHE_CHECK([for shared library path variable], [acl_cv_libpath], [ LD="$LD" \ ${CONFIG_SHELL-/bin/sh} "$ac_aux_dir/config.libpath" "$host" > conftest.sh . ./conftest.sh diff --git a/m4/rename-dest-slash.m4 b/m4/rename-dest-slash.m4 index 227f2376d0..b225d7b04d 100644 --- a/m4/rename-dest-slash.m4 +++ b/m4/rename-dest-slash.m4 @@ -1,6 +1,6 @@ -#serial 2 +# serial 3 -# Copyright (C) 2006 Free Software Foundation, Inc. +# Copyright (C) 2006, 2009 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. @@ -34,8 +34,8 @@ AC_DEFUN([gl_FUNC_RENAME_TRAILING_DEST_SLASH], rm -rf conftest.d1 conftest.d2 ]) if test $gl_cv_func_rename_trailing_dest_slash_bug = yes; then - AC_LIBOBJ(rename-dest-slash) - AC_DEFINE(rename, rpl_rename_dest_slash, + AC_LIBOBJ([rename-dest-slash]) + AC_DEFINE([rename], [rpl_rename_dest_slash], [Define to rpl_rename_dest_slash if the replacement function should be used.]) fi ]) diff --git a/m4/rename.m4 b/m4/rename.m4 index 39ad5e7861..fa7ae8d3f1 100644 --- a/m4/rename.m4 +++ b/m4/rename.m4 @@ -1,6 +1,6 @@ -#serial 10 +# serial 11 -# Copyright (C) 2001, 2003, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2001, 2003, 2005, 2006, 2009 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. @@ -38,10 +38,10 @@ AC_DEFUN([gl_FUNC_RENAME], rm -rf conftest.d1 conftest.d2 ]) if test $gl_cv_func_rename_trailing_slash_bug = yes; then - AC_LIBOBJ(rename) - AC_DEFINE(rename, rpl_rename, + AC_LIBOBJ([rename]) + AC_DEFINE([rename], [rpl_rename], [Define to rpl_rename if the replacement function should be used.]) - AC_DEFINE(RENAME_TRAILING_SLASH_BUG, 1, + AC_DEFINE([RENAME_TRAILING_SLASH_BUG], [1], [Define if rename does not work for source file names with a trailing slash, like the one from SunOS 4.1.1_U1.]) gl_PREREQ_RENAME diff --git a/m4/rmdir-errno.m4 b/m4/rmdir-errno.m4 index 7693bc70b4..4aca054512 100644 --- a/m4/rmdir-errno.m4 +++ b/m4/rmdir-errno.m4 @@ -1,6 +1,6 @@ -#serial 8 +# serial 9 -# Copyright (C) 2000, 2001, 2005, 2006 Free Software Foundation, Inc. +# Copyright (C) 2000, 2001, 2005, 2006, 2009 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. @@ -12,7 +12,7 @@ # test runs a test to determine the actual numeric value. AC_DEFUN([gl_FUNC_RMDIR_NOTEMPTY], [dnl - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) AC_CACHE_CHECK([for rmdir-not-empty errno value], gl_cv_func_rmdir_errno_not_empty, [ diff --git a/m4/rmdir.m4 b/m4/rmdir.m4 index 7235203f2e..bbe8bbd748 100644 --- a/m4/rmdir.m4 +++ b/m4/rmdir.m4 @@ -1,10 +1,10 @@ -# rmdir.m4 serial 3 -dnl Copyright (C) 2002, 2005 Free Software Foundation, Inc. +# rmdir.m4 serial 4 +dnl Copyright (C) 2002, 2005, 2009 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. AC_DEFUN([gl_FUNC_RMDIR], [ - AC_REPLACE_FUNCS(rmdir) + AC_REPLACE_FUNCS([rmdir]) ]) diff --git a/m4/roundf.m4 b/m4/roundf.m4 index 02c80d70b5..ac6bb64101 100644 --- a/m4/roundf.m4 +++ b/m4/roundf.m4 @@ -1,5 +1,5 @@ -# roundf.m4 serial 5 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# roundf.m4 serial 6 +dnl Copyright (C) 2007-2009 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. @@ -57,7 +57,7 @@ int main() gl_FUNC_FLOORF_LIBS gl_FUNC_CEILF_LIBS if test "$FLOORF_LIBM" != '?' && test "$CEILF_LIBM" != '?'; then - AC_DEFINE([HAVE_FLOORF_AND_CEILF], 1, + AC_DEFINE([HAVE_FLOORF_AND_CEILF], [1], [Define if the both the floorf() and ceilf() functions exist.]) ROUNDF_LIBM="$FLOORF_LIBM $CEILF_LIBM" else diff --git a/m4/roundl.m4 b/m4/roundl.m4 index de9f63a0f0..427c199372 100644 --- a/m4/roundl.m4 +++ b/m4/roundl.m4 @@ -1,5 +1,5 @@ -# roundl.m4 serial 4 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# roundl.m4 serial 5 +dnl Copyright (C) 2007, 2009 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,7 +22,7 @@ AC_DEFUN([gl_FUNC_ROUNDL], gl_FUNC_FLOORL_LIBS gl_FUNC_CEILL_LIBS if test "$FLOORL_LIBM" != '?' && test "$CEILL_LIBM" != '?'; then - AC_DEFINE([HAVE_FLOORL_AND_CEILL], 1, + AC_DEFINE([HAVE_FLOORL_AND_CEILL], [1], [Define if the both the floorl() and ceill() functions exist.]) ROUNDL_LIBM="$FLOORL_LIBM $CEILL_LIBM" else diff --git a/m4/rpmatch.m4 b/m4/rpmatch.m4 index e4c986d8ec..387deffbf8 100644 --- a/m4/rpmatch.m4 +++ b/m4/rpmatch.m4 @@ -1,5 +1,5 @@ -# rpmatch.m4 serial 7 -dnl Copyright (C) 2002-2003, 2007-2008 Free Software Foundation, Inc. +# rpmatch.m4 serial 8 +dnl Copyright (C) 2002-2003, 2007-2009 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. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_RPMATCH], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) - AC_REPLACE_FUNCS(rpmatch) + AC_REPLACE_FUNCS([rpmatch]) if test $ac_cv_func_rpmatch = no; then HAVE_RPMATCH=0 gl_PREREQ_RPMATCH @@ -19,14 +19,14 @@ AC_DEFUN([gl_FUNC_RPMATCH], # Prerequisites of lib/rpmatch.c. AC_DEFUN([gl_PREREQ_RPMATCH], [ - AC_CACHE_CHECK([for nl_langinfo and YESEXPR], gl_cv_langinfo_yesexpr, + AC_CACHE_CHECK([for nl_langinfo and YESEXPR], [gl_cv_langinfo_yesexpr], [AC_TRY_LINK([#include <langinfo.h>], [char* cs = nl_langinfo(YESEXPR); return !cs;], [gl_cv_langinfo_yesexpr=yes], [gl_cv_langinfo_yesexpr=no]) ]) if test $gl_cv_langinfo_yesexpr = yes; then - AC_DEFINE([HAVE_LANGINFO_YESEXPR], 1, + AC_DEFINE([HAVE_LANGINFO_YESEXPR], [1], [Define if you have <langinfo.h> and nl_langinfo(YESEXPR).]) fi ]) diff --git a/m4/save-cwd.m4 b/m4/save-cwd.m4 index 7a2286bf44..c9b3a3b448 100644 --- a/m4/save-cwd.m4 +++ b/m4/save-cwd.m4 @@ -1,5 +1,5 @@ -#serial 8 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# serial 9 +dnl Copyright (C) 2002-2006, 2009 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. @@ -8,5 +8,5 @@ AC_DEFUN([gl_SAVE_CWD], [ AC_LIBOBJ([save-cwd]) dnl Prerequisites for lib/save-cwd.c. - AC_CHECK_FUNCS_ONCE(fchdir) + AC_CHECK_FUNCS_ONCE([fchdir]) ]) diff --git a/m4/selinux-selinux-h.m4 b/m4/selinux-selinux-h.m4 index 464b7821f1..c6e735c08f 100644 --- a/m4/selinux-selinux-h.m4 +++ b/m4/selinux-selinux-h.m4 @@ -1,5 +1,5 @@ -# serial 1 -*- Autoconf -*- -# Copyright (C) 2006, 2007 Free Software Foundation, Inc. +# serial 2 -*- Autoconf -*- +# Copyright (C) 2006, 2007, 2009 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. @@ -20,6 +20,6 @@ AC_DEFUN([gl_HEADERS_SELINUX_SELINUX_H], AC_SEARCH_LIBS([setfilecon], [selinux], [test "$ac_cv_search_setfilecon" = "none required" || LIB_SELINUX=$ac_cv_search_setfilecon]) - AC_SUBST(LIB_SELINUX) + AC_SUBST([LIB_SELINUX]) LIBS=$gl_save_LIBS ]) diff --git a/m4/setenv.m4 b/m4/setenv.m4 index 7af13d7241..e28407ee17 100644 --- a/m4/setenv.m4 +++ b/m4/setenv.m4 @@ -1,5 +1,5 @@ -# setenv.m4 serial 10 -dnl Copyright (C) 2001-2004, 2006-2008 Free Software Foundation, Inc. +# setenv.m4 serial 11 +dnl Copyright (C) 2001-2004, 2006-2009 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. @@ -35,7 +35,7 @@ AC_DEFUN([gl_FUNC_UNSETENV], AC_LIBOBJ([unsetenv]) gl_PREREQ_UNSETENV else - AC_CACHE_CHECK([for unsetenv() return type], gt_cv_func_unsetenv_ret, + AC_CACHE_CHECK([for unsetenv() return type], [gt_cv_func_unsetenv_ret], [AC_TRY_COMPILE([#include <stdlib.h> extern #ifdef __cplusplus @@ -58,14 +58,14 @@ AC_DEFUN([gl_PREREQ_SETENV], [ AC_REQUIRE([AC_FUNC_ALLOCA]) AC_REQUIRE([gl_ENVIRON]) - AC_CHECK_HEADERS_ONCE(unistd.h) - AC_CHECK_HEADERS(search.h) - AC_CHECK_FUNCS(tsearch) + AC_CHECK_HEADERS_ONCE([unistd.h]) + AC_CHECK_HEADERS([search.h]) + AC_CHECK_FUNCS([tsearch]) ]) # Prerequisites of lib/unsetenv.c. AC_DEFUN([gl_PREREQ_UNSETENV], [ AC_REQUIRE([gl_ENVIRON]) - AC_CHECK_HEADERS_ONCE(unistd.h) + AC_CHECK_HEADERS_ONCE([unistd.h]) ]) diff --git a/m4/settime.m4 b/m4/settime.m4 index 693e84ebbc..c648bcb452 100644 --- a/m4/settime.m4 +++ b/m4/settime.m4 @@ -1,5 +1,5 @@ -# settime.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2005, 2006 Free Software Foundation, Inc. +# settime.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2005, 2006, 2009 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. @@ -11,5 +11,5 @@ AC_DEFUN([gl_SETTIME], dnl Prerequisites of lib/settime.c. AC_REQUIRE([gl_CLOCK_TIME]) AC_REQUIRE([gl_TIMESPEC]) - AC_CHECK_FUNCS_ONCE(settimeofday stime) + AC_CHECK_FUNCS_ONCE([settimeofday stime]) ]) diff --git a/m4/sig2str.m4 b/m4/sig2str.m4 index 8b85c430cb..defc626cc7 100644 --- a/m4/sig2str.m4 +++ b/m4/sig2str.m4 @@ -1,5 +1,5 @@ -#serial 5 -dnl Copyright (C) 2002, 2005, 2006 Free Software Foundation, Inc. +# serial 6 +dnl Copyright (C) 2002, 2005, 2006, 2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_SIG2STR], [ - AC_REPLACE_FUNCS(sig2str) + AC_REPLACE_FUNCS([sig2str]) if test $ac_cv_func_sig2str = no; then gl_PREREQ_SIG2STR fi diff --git a/m4/sig_atomic_t.m4 b/m4/sig_atomic_t.m4 index a05a73be77..9c458969f7 100644 --- a/m4/sig_atomic_t.m4 +++ b/m4/sig_atomic_t.m4 @@ -1,13 +1,13 @@ -# sig_atomic_t.m4 serial 1 (gettext-0.13) -dnl Copyright (C) 2003 Free Software Foundation, Inc. +# sig_atomic_t.m4 serial 2 (gettext-0.13) +dnl Copyright (C) 2003, 2009 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. AC_DEFUN([gt_TYPE_SIG_ATOMIC_T], [ - AC_CHECK_TYPES(sig_atomic_t, , - [AC_DEFINE(sig_atomic_t, int, + AC_CHECK_TYPES([sig_atomic_t], , + [AC_DEFINE([sig_atomic_t], [int], [Define as an integer type suitable for memory locations that can be accessed atomically even in the presence of asynchnonous signals.])], [#include <signal.h>]) diff --git a/m4/signalblocking.m4 b/m4/signalblocking.m4 index 300f3532c0..82b0404c4c 100644 --- a/m4/signalblocking.m4 +++ b/m4/signalblocking.m4 @@ -1,5 +1,5 @@ -# signalblocking.m4 serial 9 -dnl Copyright (C) 2001-2002, 2006-2008 Free Software Foundation, Inc. +# signalblocking.m4 serial 10 +dnl Copyright (C) 2001-2002, 2006-2009 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. @@ -13,9 +13,9 @@ AC_DEFUN([gl_SIGNALBLOCKING], [ AC_REQUIRE([gl_SIGNAL_H_DEFAULTS]) signals_not_posix= - AC_EGREP_HEADER(sigset_t, signal.h, , signals_not_posix=1) + AC_EGREP_HEADER([sigset_t], [signal.h], , [signals_not_posix=1]) if test -z "$signals_not_posix"; then - AC_CHECK_FUNC(sigprocmask, [gl_cv_func_sigprocmask=1]) + AC_CHECK_FUNC([sigprocmask], [gl_cv_func_sigprocmask=1]) fi if test -z "$gl_cv_func_sigprocmask"; then HAVE_POSIX_SIGNALBLOCKING=0 diff --git a/m4/signbit.m4 b/m4/signbit.m4 index 05d2a05963..233bf2a39a 100644 --- a/m4/signbit.m4 +++ b/m4/signbit.m4 @@ -1,5 +1,5 @@ -# signbit.m4 serial 5 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# signbit.m4 serial 6 +dnl Copyright (C) 2007-2009 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. @@ -74,7 +74,7 @@ AC_DEFUN([gl_SIGNBIT], [gl_cv_func_copysignf_no_libm=no]) ]) if test $gl_cv_func_copysignf_no_libm = yes; then - AC_DEFINE([HAVE_COPYSIGNF_IN_LIBC], 1, + AC_DEFINE([HAVE_COPYSIGNF_IN_LIBC], [1], [Define if the copysignf function is declared in <math.h> and available in libc.]) fi fi @@ -94,7 +94,7 @@ AC_DEFUN([gl_SIGNBIT], [gl_cv_func_copysign_no_libm=no]) ]) if test $gl_cv_func_copysign_no_libm = yes; then - AC_DEFINE([HAVE_COPYSIGN_IN_LIBC], 1, + AC_DEFINE([HAVE_COPYSIGN_IN_LIBC], [1], [Define if the copysign function is declared in <math.h> and available in libc.]) fi fi @@ -114,7 +114,7 @@ AC_DEFUN([gl_SIGNBIT], [gl_cv_func_copysignl_no_libm=no]) ]) if test $gl_cv_func_copysignl_no_libm = yes; then - AC_DEFINE([HAVE_COPYSIGNL_IN_LIBC], 1, + AC_DEFINE([HAVE_COPYSIGNL_IN_LIBC], [1], [Define if the copysignl function is declared in <math.h> and available in libc.]) fi fi diff --git a/m4/sigpipe.m4 b/m4/sigpipe.m4 index a6a392192a..d51ac6033e 100644 --- a/m4/sigpipe.m4 +++ b/m4/sigpipe.m4 @@ -1,5 +1,5 @@ -# sigpipe.m4 serial 1 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# sigpipe.m4 serial 2 +dnl Copyright (C) 2008, 2009 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,8 +16,8 @@ AC_DEFUN([gl_SIGNAL_SIGPIPE], AC_DEFUN([gl_SIGNAL_SIGPIPE_BODY], [ AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([for SIGPIPE], gl_cv_header_signal_h_SIGPIPE, [ - AC_EGREP_CPP(booboo,[ + AC_CACHE_CHECK([for SIGPIPE], [gl_cv_header_signal_h_SIGPIPE], [ + AC_EGREP_CPP([booboo],[ #include <signal.h> #if !defined SIGPIPE booboo diff --git a/m4/sockets.m4 b/m4/sockets.m4 index 124e777a5e..d5a7dbfb4b 100644 --- a/m4/sockets.m4 +++ b/m4/sockets.m4 @@ -1,5 +1,5 @@ -# sockets.m4 serial 3 -dnl Copyright (C) 2008 Free Software Foundation, Inc. +# sockets.m4 serial 4 +dnl Copyright (C) 2008, 2009 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. @@ -26,7 +26,7 @@ AC_DEFUN([gl_SOCKETS], LIBS="$gl_save_LIBS" ]) if test "$gl_cv_func_wsastartup" = "yes"; then - AC_DEFINE([WINDOWS_SOCKETS], 1, [Define if WSAStartup is needed.]) + AC_DEFINE([WINDOWS_SOCKETS], [1], [Define if WSAStartup is needed.]) LIBSOCKET='-lws2_32' fi else diff --git a/m4/sockpfaf.m4 b/m4/sockpfaf.m4 index 25d9755c5e..99ea06f96f 100644 --- a/m4/sockpfaf.m4 +++ b/m4/sockpfaf.m4 @@ -1,5 +1,5 @@ -# sockpfaf.m4 serial 5 -dnl Copyright (C) 2004, 2006 Free Software Foundation, Inc. +# sockpfaf.m4 serial 6 +dnl Copyright (C) 2004, 2006, 2009 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,8 +16,8 @@ AC_DEFUN([gl_SOCKET_FAMILIES], AC_REQUIRE([gl_HEADER_SYS_SOCKET]) AC_CHECK_HEADERS_ONCE([netinet/in.h]) - AC_MSG_CHECKING(for IPv4 sockets) - AC_CACHE_VAL(gl_cv_socket_ipv4, + AC_MSG_CHECKING([for IPv4 sockets]) + AC_CACHE_VAL([gl_cv_socket_ipv4], [AC_TRY_COMPILE([#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@ -31,13 +31,13 @@ AC_DEFUN([gl_SOCKET_FAMILIES], [int x = AF_INET; struct in_addr y; struct sockaddr_in z; if (&x && &y && &z) return 0;], gl_cv_socket_ipv4=yes, gl_cv_socket_ipv4=no)]) - AC_MSG_RESULT($gl_cv_socket_ipv4) + AC_MSG_RESULT([$gl_cv_socket_ipv4]) if test $gl_cv_socket_ipv4 = yes; then - AC_DEFINE(HAVE_IPV4, 1, [Define to 1 if <sys/socket.h> defines AF_INET.]) + AC_DEFINE([HAVE_IPV4], [1], [Define to 1 if <sys/socket.h> defines AF_INET.]) fi - AC_MSG_CHECKING(for IPv6 sockets) - AC_CACHE_VAL(gl_cv_socket_ipv6, + AC_MSG_CHECKING([for IPv6 sockets]) + AC_CACHE_VAL([gl_cv_socket_ipv6], [AC_TRY_COMPILE([#include <sys/types.h> #ifdef HAVE_SYS_SOCKET_H #include <sys/socket.h> @@ -51,8 +51,8 @@ AC_DEFUN([gl_SOCKET_FAMILIES], [int x = AF_INET6; struct in6_addr y; struct sockaddr_in6 z; if (&x && &y && &z) return 0;], gl_cv_socket_ipv6=yes, gl_cv_socket_ipv6=no)]) - AC_MSG_RESULT($gl_cv_socket_ipv6) + AC_MSG_RESULT([$gl_cv_socket_ipv6]) if test $gl_cv_socket_ipv6 = yes; then - AC_DEFINE(HAVE_IPV6, 1, [Define to 1 if <sys/socket.h> defines AF_INET6.]) + AC_DEFINE([HAVE_IPV6], [1], [Define to 1 if <sys/socket.h> defines AF_INET6.]) fi ]) diff --git a/m4/st_dm_mode.m4 b/m4/st_dm_mode.m4 index c1da15439c..6a6d5b72e1 100644 --- a/m4/st_dm_mode.m4 +++ b/m4/st_dm_mode.m4 @@ -1,6 +1,6 @@ -#serial 4 +# serial 5 -# Copyright (C) 1998, 1999, 2001 Free Software Foundation, Inc. +# Copyright (C) 1998, 1999, 2001, 2009 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. @@ -8,14 +8,14 @@ # Define HAVE_ST_DM_MODE if struct stat has an st_dm_mode member. AC_DEFUN([AC_STRUCT_ST_DM_MODE], - [AC_CACHE_CHECK([for st_dm_mode in struct stat], ac_cv_struct_st_dm_mode, + [AC_CACHE_CHECK([for st_dm_mode in struct stat], [ac_cv_struct_st_dm_mode], [AC_TRY_COMPILE([#include <sys/types.h> #include <sys/stat.h>], [struct stat s; s.st_dm_mode;], ac_cv_struct_st_dm_mode=yes, ac_cv_struct_st_dm_mode=no)]) if test $ac_cv_struct_st_dm_mode = yes; then - AC_DEFINE(HAVE_ST_DM_MODE, 1, + AC_DEFINE([HAVE_ST_DM_MODE], [1], [Define if struct stat has an st_dm_mode member. ]) fi ] diff --git a/m4/stat-time.m4 b/m4/stat-time.m4 index 84dc26f4ac..b860be82e2 100644 --- a/m4/stat-time.m4 +++ b/m4/stat-time.m4 @@ -1,6 +1,6 @@ # Checks for stat-related time functions. -# Copyright (C) 1998, 1999, 2001, 2003, 2005, 2006, 2007 Free Software +# Copyright (C) 1998-1999, 2001, 2003, 2005-2007, 2009 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -43,7 +43,7 @@ AC_DEFUN([gl_STAT_TIME], [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=yes], [ac_cv_typeof_struct_stat_st_atim_is_struct_timespec=no])]) if test $ac_cv_typeof_struct_stat_st_atim_is_struct_timespec = yes; then - AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], 1, + AC_DEFINE([TYPEOF_STRUCT_STAT_ST_ATIM_IS_STRUCT_TIMESPEC], [1], [Define to 1 if the type of the st_atim member of a struct stat is struct timespec.]) fi], diff --git a/m4/stdbool.m4 b/m4/stdbool.m4 index 2204ecd984..57c804a80f 100644 --- a/m4/stdbool.m4 +++ b/m4/stdbool.m4 @@ -1,6 +1,6 @@ # Check for stdbool.h that conforms to C99. -dnl Copyright (C) 2002-2006 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2006, 2009 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. @@ -111,5 +111,5 @@ AC_DEFUN([AC_HEADER_STDBOOL], [ac_cv_header_stdbool_h=no])]) AC_CHECK_TYPES([_Bool]) if test $ac_cv_header_stdbool_h = yes; then - AC_DEFINE(HAVE_STDBOOL_H, 1, [Define to 1 if stdbool.h conforms to C99.]) + AC_DEFINE([HAVE_STDBOOL_H], [1], [Define to 1 if stdbool.h conforms to C99.]) fi]) diff --git a/m4/stdint.m4 b/m4/stdint.m4 index e507a02eb8..b4194c8adc 100644 --- a/m4/stdint.m4 +++ b/m4/stdint.m4 @@ -1,5 +1,5 @@ -# stdint.m4 serial 32 -dnl Copyright (C) 2001-2008 Free Software Foundation, Inc. +# stdint.m4 serial 33 +dnl Copyright (C) 2001-2009 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 @@ dnl Test whether <stdint.h> is supported or must be substituted. AC_DEFUN([gl_STDINT_H], [ - AC_PREREQ(2.59)dnl + AC_PREREQ([2.59])dnl dnl Check for long long int and unsigned long long int. AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) @@ -229,7 +229,7 @@ struct s { gl_STDINT_TYPE_PROPERTIES STDINT_H=stdint.h fi - AC_SUBST(STDINT_H) + AC_SUBST([STDINT_H]) ]) dnl gl_STDINT_BITSIZEOF(TYPES, INCLUDES) @@ -292,7 +292,7 @@ AC_DEFUN([gl_CHECK_TYPES_SIGNED], eval result=\$gl_cv_type_${gltype}_signed GLTYPE=`echo $gltype | tr 'abcdefghijklmnopqrstuvwxyz ' 'ABCDEFGHIJKLMNOPQRSTUVWXYZ_'` if test "$result" = yes; then - AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], 1) + AC_DEFINE_UNQUOTED([HAVE_SIGNED_${GLTYPE}], [1]) eval HAVE_SIGNED_${GLTYPE}=1 else eval HAVE_SIGNED_${GLTYPE}=0 @@ -348,7 +348,7 @@ AC_DEFUN([gl_INTEGER_TYPE_SUFFIX], eval result=\$gl_cv_type_${gltype}_suffix test "$result" = no && result= eval ${GLTYPE}_SUFFIX=\$result - AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], $result) + AC_DEFINE_UNQUOTED([${GLTYPE}_SUFFIX], [$result]) done m4_foreach_w([gltype], [$1], [AC_SUBST(translit(gltype,[abcdefghijklmnopqrstuvwxyz ],[ABCDEFGHIJKLMNOPQRSTUVWXYZ_])[_SUFFIX])]) diff --git a/m4/stdint_h.m4 b/m4/stdint_h.m4 index 2c8e649799..82f0c244c8 100644 --- a/m4/stdint_h.m4 +++ b/m4/stdint_h.m4 @@ -1,5 +1,5 @@ -# stdint_h.m4 serial 7 -dnl Copyright (C) 1997-2004, 2006, 2008 Free Software Foundation, Inc. +# stdint_h.m4 serial 8 +dnl Copyright (C) 1997-2004, 2006, 2008, 2009 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. @@ -19,7 +19,7 @@ AC_DEFUN([gl_AC_HEADER_STDINT_H], [gl_cv_header_stdint_h=yes], [gl_cv_header_stdint_h=no])]) if test $gl_cv_header_stdint_h = yes; then - AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], 1, + AC_DEFINE_UNQUOTED([HAVE_STDINT_H_WITH_UINTMAX], [1], [Define if <stdint.h> exists, doesn't clash with <sys/types.h>, and declares uintmax_t. ]) fi diff --git a/m4/stpcpy.m4 b/m4/stpcpy.m4 index c38f40ee6d..96de86795a 100644 --- a/m4/stpcpy.m4 +++ b/m4/stpcpy.m4 @@ -1,5 +1,5 @@ -# stpcpy.m4 serial 6 -dnl Copyright (C) 2002, 2007 Free Software Foundation, Inc. +# stpcpy.m4 serial 7 +dnl Copyright (C) 2002, 2007, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_STPCPY], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(stpcpy) + AC_REPLACE_FUNCS([stpcpy]) if test $ac_cv_func_stpcpy = no; then HAVE_STPCPY=0 gl_PREREQ_STPCPY diff --git a/m4/stpncpy.m4 b/m4/stpncpy.m4 index 1269359c12..75f57394bc 100644 --- a/m4/stpncpy.m4 +++ b/m4/stpncpy.m4 @@ -1,5 +1,5 @@ -# stpncpy.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. +# stpncpy.m4 serial 10 +dnl Copyright (C) 2002-2003, 2005-2007, 2009 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. @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_STPNCPY], dnl in AIX: dest + max(0,n-1) dnl Only the glibc return value is useful in practice. - AC_CACHE_CHECK([for working stpncpy], gl_cv_func_stpncpy, [ + AC_CACHE_CHECK([for working stpncpy], [gl_cv_func_stpncpy], [ AC_TRY_RUN([ #include <stdlib.h> #include <string.h> /* for strcpy */ @@ -53,7 +53,7 @@ int main () { ], gl_cv_func_stpncpy=yes, gl_cv_func_stpncpy=no)])]) if test $gl_cv_func_stpncpy = yes; then - AC_DEFINE(HAVE_STPNCPY, 1, + AC_DEFINE([HAVE_STPNCPY], [1], [Define if you have the stpncpy() function and it works.]) else HAVE_STPNCPY=0 diff --git a/m4/strcase.m4 b/m4/strcase.m4 index 79c525c110..0dfdb1a181 100644 --- a/m4/strcase.m4 +++ b/m4/strcase.m4 @@ -1,5 +1,5 @@ -# strcase.m4 serial 9 -dnl Copyright (C) 2002, 2005-2008 Free Software Foundation, Inc. +# strcase.m4 serial 10 +dnl Copyright (C) 2002, 2005-2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_STRCASE], AC_DEFUN([gl_FUNC_STRCASECMP], [ AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - AC_REPLACE_FUNCS(strcasecmp) + AC_REPLACE_FUNCS([strcasecmp]) if test $ac_cv_func_strcasecmp = no; then HAVE_STRCASECMP=0 gl_PREREQ_STRCASECMP @@ -23,11 +23,11 @@ AC_DEFUN([gl_FUNC_STRCASECMP], AC_DEFUN([gl_FUNC_STRNCASECMP], [ AC_REQUIRE([gl_HEADER_STRINGS_H_DEFAULTS]) - AC_REPLACE_FUNCS(strncasecmp) + AC_REPLACE_FUNCS([strncasecmp]) if test $ac_cv_func_strncasecmp = no; then gl_PREREQ_STRNCASECMP fi - AC_CHECK_DECLS(strncasecmp) + AC_CHECK_DECLS([strncasecmp]) if test $ac_cv_have_decl_strncasecmp = no; then HAVE_DECL_STRNCASECMP=0 fi diff --git a/m4/strchrnul.m4 b/m4/strchrnul.m4 index 7c1273aa8c..7e270d065e 100644 --- a/m4/strchrnul.m4 +++ b/m4/strchrnul.m4 @@ -1,5 +1,5 @@ -# strchrnul.m4 serial 6 -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# strchrnul.m4 serial 7 +dnl Copyright (C) 2003, 2007, 2009 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. @@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRCHRNUL], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strchrnul) + AC_REPLACE_FUNCS([strchrnul]) if test $ac_cv_func_strchrnul = no; then HAVE_STRCHRNUL=0 gl_PREREQ_STRCHRNUL diff --git a/m4/strcspn.m4 b/m4/strcspn.m4 index 95650040b4..034adfae41 100644 --- a/m4/strcspn.m4 +++ b/m4/strcspn.m4 @@ -1,12 +1,12 @@ -# strcspn.m4 serial 2 -dnl Copyright (C) 2002-2003 Free Software Foundation, Inc. +# strcspn.m4 serial 3 +dnl Copyright (C) 2002-2003, 2009 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. AC_DEFUN([gl_FUNC_STRCSPN], [ - AC_REPLACE_FUNCS(strcspn) + AC_REPLACE_FUNCS([strcspn]) if test $ac_cv_func_strcspn = no; then gl_PREREQ_STRCSPN fi diff --git a/m4/strdup.m4 b/m4/strdup.m4 index 0537def373..d7daac2bab 100644 --- a/m4/strdup.m4 +++ b/m4/strdup.m4 @@ -1,6 +1,6 @@ -# strdup.m4 serial 10 +# strdup.m4 serial 11 -dnl Copyright (C) 2002-2008 Free Software Foundation, Inc. +dnl Copyright (C) 2002-2009 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,8 +9,8 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRDUP], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strdup) - AC_CHECK_DECLS_ONCE(strdup) + AC_REPLACE_FUNCS([strdup]) + AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi @@ -25,9 +25,9 @@ AC_DEFUN([gl_FUNC_STRDUP_POSIX], REPLACE_STRDUP=1 AC_LIBOBJ([strdup]) else - AC_REPLACE_FUNCS(strdup) + AC_REPLACE_FUNCS([strdup]) fi - AC_CHECK_DECLS_ONCE(strdup) + AC_CHECK_DECLS_ONCE([strdup]) if test $ac_cv_have_decl_strdup = no; then HAVE_DECL_STRDUP=0 fi diff --git a/m4/strftime.m4 b/m4/strftime.m4 index 70b537894d..156defbfb4 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,7 +1,7 @@ -#serial 29 +# serial 30 # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, -# 2006, 2007 Free Software Foundation, Inc. +# 2006, 2007, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -25,8 +25,8 @@ AC_DEFUN([gl_FUNC_STRFTIME], AC_REQUIRE([AC_TYPE_MBSTATE_T]) AC_REQUIRE([gl_TM_GMTOFF]) - AC_CHECK_FUNCS_ONCE(mblen mbrlen mempcpy tzset) - AC_CHECK_HEADERS_ONCE(wchar.h) + AC_CHECK_FUNCS_ONCE([mblen mbrlen mempcpy tzset]) + AC_CHECK_HEADERS_ONCE([wchar.h]) AC_DEFINE([my_strftime], [nstrftime], [Define to the name of the strftime replacement function.]) diff --git a/m4/strndup.m4 b/m4/strndup.m4 index 1be2a85c5e..4fa7d5a7c9 100644 --- a/m4/strndup.m4 +++ b/m4/strndup.m4 @@ -1,5 +1,5 @@ -# strndup.m4 serial 15 -dnl Copyright (C) 2002-2003, 2005-2008 Free Software Foundation, Inc. +# strndup.m4 serial 16 +dnl Copyright (C) 2002-2003, 2005-2009 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,7 +16,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], fi # 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_CACHE_CHECK([for working strndup], [gl_cv_func_strndup], [AC_RUN_IFELSE([ AC_LANG_PROGRAM([[#include <string.h> #include <stdlib.h>]], [[ @@ -40,7 +40,7 @@ AC_DEFUN([gl_FUNC_STRNDUP], [gl_cv_func_strndup=yes])], [gl_cv_func_strndup=no])])]) if test $gl_cv_func_strndup = yes; then - AC_DEFINE([HAVE_STRNDUP], 1, + AC_DEFINE([HAVE_STRNDUP], [1], [Define if you have the strndup() function and it works.]) else HAVE_STRNDUP=0 diff --git a/m4/strnlen.m4 b/m4/strnlen.m4 index d8307eda4a..1c97859db1 100644 --- a/m4/strnlen.m4 +++ b/m4/strnlen.m4 @@ -1,5 +1,5 @@ -# strnlen.m4 serial 9 -dnl Copyright (C) 2002-2003, 2005-2007 Free Software Foundation, Inc. +# strnlen.m4 serial 10 +dnl Copyright (C) 2002-2003, 2005-2007, 2009 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. @@ -20,8 +20,8 @@ AC_DEFUN([gl_FUNC_STRNLEN], # This is necessary because automake-1.6.1 doesn't understand # that the above use of AC_FUNC_STRNLEN means we may have to use # lib/strnlen.c. - #AC_LIBOBJ(strnlen) - AC_DEFINE(strnlen, rpl_strnlen, + #AC_LIBOBJ([strnlen]) + AC_DEFINE([strnlen], [rpl_strnlen], [Define to rpl_strnlen if the replacement function should be used.]) gl_PREREQ_STRNLEN fi diff --git a/m4/strpbrk.m4 b/m4/strpbrk.m4 index 0398d45dbb..fb5db91b7e 100644 --- a/m4/strpbrk.m4 +++ b/m4/strpbrk.m4 @@ -1,5 +1,5 @@ -# strpbrk.m4 serial 4 -dnl Copyright (C) 2002-2003, 2007 Free Software Foundation, Inc. +# strpbrk.m4 serial 5 +dnl Copyright (C) 2002-2003, 2007, 2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_STRPBRK], [ AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strpbrk) + AC_REPLACE_FUNCS([strpbrk]) if test $ac_cv_func_strpbrk = no; then HAVE_STRPBRK=0 gl_PREREQ_STRPBRK diff --git a/m4/strptime.m4 b/m4/strptime.m4 index 060f000021..ee49a6e26e 100644 --- a/m4/strptime.m4 +++ b/m4/strptime.m4 @@ -1,5 +1,5 @@ -# strptime.m4 serial 4 -dnl Copyright (C) 2007 Free Software Foundation, Inc. +# strptime.m4 serial 5 +dnl Copyright (C) 2007, 2009 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. @@ -8,7 +8,7 @@ AC_DEFUN([gl_FUNC_STRPTIME], [ AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) AC_REQUIRE([AC_C_RESTRICT]) - AC_REPLACE_FUNCS(strptime) + AC_REPLACE_FUNCS([strptime]) AC_REQUIRE([gl_TM_GMTOFF]) if test $ac_cv_func_strptime = yes; then REPLACE_STRPTIME=0 diff --git a/m4/strsep.m4 b/m4/strsep.m4 index 1231dcb129..887d6889e7 100644 --- a/m4/strsep.m4 +++ b/m4/strsep.m4 @@ -1,5 +1,5 @@ -# strsep.m4 serial 8 -dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. +# strsep.m4 serial 9 +dnl Copyright (C) 2002, 2003, 2004, 2007, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_STRSEP], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strsep) + AC_REPLACE_FUNCS([strsep]) if test $ac_cv_func_strsep = no; then HAVE_STRSEP=0 gl_PREREQ_STRSEP diff --git a/m4/strtod.m4 b/m4/strtod.m4 index 5d526177b4..caaaa4b459 100644 --- a/m4/strtod.m4 +++ b/m4/strtod.m4 @@ -1,6 +1,5 @@ -# strtod.m4 serial 9 -dnl Copyright (C) 2002, 2003, 2006, 2007, 2008 Free Software -dnl Foundation, Inc. +# strtod.m4 serial 10 +dnl Copyright (C) 2002-2003, 2006-2009 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 +8,7 @@ AC_DEFUN([gl_FUNC_STRTOD], [ AC_REQUIRE([gl_STDLIB_H_DEFAULTS]) AC_FUNC_STRTOD - dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ(strtod). + dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ([strtod]). if test $ac_cv_func_strtod = no; then HAVE_STRTOD=0 REPLACE_STRTOD=1 diff --git a/m4/strtoimax.m4 b/m4/strtoimax.m4 index 6ed66c9687..70b3ba418a 100644 --- a/m4/strtoimax.m4 +++ b/m4/strtoimax.m4 @@ -1,5 +1,5 @@ -# strtoimax.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +# strtoimax.m4 serial 7 +dnl Copyright (C) 2002, 2003, 2004, 2006, 2009 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. @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_STRTOIMAX], gl_cv_func_strtoimax_macro=no)]) if test "$gl_cv_func_strtoimax_macro" != yes; then - AC_REPLACE_FUNCS(strtoimax) + AC_REPLACE_FUNCS([strtoimax]) if test $ac_cv_func_strtoimax = no; then gl_PREREQ_STRTOIMAX fi @@ -29,6 +29,6 @@ AC_DEFUN([gl_FUNC_STRTOIMAX], # Prerequisites of lib/strtoimax.c. AC_DEFUN([gl_PREREQ_STRTOIMAX], [ - AC_CHECK_DECLS(strtoll) + AC_CHECK_DECLS([strtoll]) AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) ]) diff --git a/m4/strtok_r.m4 b/m4/strtok_r.m4 index 930fed731b..b79c2eeee1 100644 --- a/m4/strtok_r.m4 +++ b/m4/strtok_r.m4 @@ -1,5 +1,5 @@ -# strtok_r.m4 serial 7 -dnl Copyright (C) 2002, 2003, 2004, 2007 Free Software Foundation, Inc. +# strtok_r.m4 serial 8 +dnl Copyright (C) 2002, 2003, 2004, 2007, 2009 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. @@ -10,8 +10,8 @@ AC_DEFUN([gl_FUNC_STRTOK_R], AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strtok_r) - AC_CHECK_DECLS_ONCE(strtok_r) + AC_REPLACE_FUNCS([strtok_r]) + AC_CHECK_DECLS_ONCE([strtok_r]) if test $ac_cv_have_decl_strtok_r = no; then HAVE_DECL_STRTOK_R=0 fi diff --git a/m4/strtol.m4 b/m4/strtol.m4 index 7fbae60eb3..25c09fdd86 100644 --- a/m4/strtol.m4 +++ b/m4/strtol.m4 @@ -1,10 +1,10 @@ -# strtol.m4 serial 4 -dnl Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. +# strtol.m4 serial 5 +dnl Copyright (C) 2002, 2003, 2006, 2009 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. AC_DEFUN([gl_FUNC_STRTOL], [ - AC_REPLACE_FUNCS(strtol) + AC_REPLACE_FUNCS([strtol]) ]) diff --git a/m4/strtoll.m4 b/m4/strtoll.m4 index c9b8951e84..7879c6fcaf 100644 --- a/m4/strtoll.m4 +++ b/m4/strtoll.m4 @@ -1,5 +1,5 @@ -# strtoll.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. +# strtoll.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2006, 2008, 2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_STRTOLL], dnl unless the type 'long long int' exists. AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) if test "$ac_cv_type_long_long_int" = yes; then - AC_REPLACE_FUNCS(strtoll) + AC_REPLACE_FUNCS([strtoll]) if test $ac_cv_func_strtoll = no; then HAVE_STRTOLL=0 gl_PREREQ_STRTOLL diff --git a/m4/strtoul.m4 b/m4/strtoul.m4 index 5ec54aa2ee..ca700062f3 100644 --- a/m4/strtoul.m4 +++ b/m4/strtoul.m4 @@ -1,10 +1,10 @@ -# strtoul.m4 serial 3 -dnl Copyright (C) 2002, 2006 Free Software Foundation, Inc. +# strtoul.m4 serial 4 +dnl Copyright (C) 2002, 2006, 2009 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. AC_DEFUN([gl_FUNC_STRTOUL], [ - AC_REPLACE_FUNCS(strtoul) + AC_REPLACE_FUNCS([strtoul]) ]) diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index 809d0bcbda..5075d95254 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,5 +1,5 @@ -# strtoull.m4 serial 5 -dnl Copyright (C) 2002, 2004, 2006, 2008 Free Software Foundation, Inc. +# strtoull.m4 serial 6 +dnl Copyright (C) 2002, 2004, 2006, 2008, 2009 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. @@ -11,7 +11,7 @@ AC_DEFUN([gl_FUNC_STRTOULL], dnl unless the type 'unsigned long long int' exists. AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) if test "$ac_cv_type_unsigned_long_long_int" = yes; then - AC_REPLACE_FUNCS(strtoull) + AC_REPLACE_FUNCS([strtoull]) if test $ac_cv_func_strtoull = no; then HAVE_STRTOULL=0 gl_PREREQ_STRTOULL diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index aef5b43097..43236a03f1 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,5 +1,5 @@ -# strtoumax.m4 serial 6 -dnl Copyright (C) 2002, 2003, 2004, 2006 Free Software Foundation, Inc. +# strtoumax.m4 serial 7 +dnl Copyright (C) 2002, 2003, 2004, 2006, 2009 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. @@ -20,7 +20,7 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], gl_cv_func_strtoumax_macro=no)]) if test "$gl_cv_func_strtoumax_macro" != yes; then - AC_REPLACE_FUNCS(strtoumax) + AC_REPLACE_FUNCS([strtoumax]) if test $ac_cv_func_strtoumax = no; then gl_PREREQ_STRTOUMAX fi @@ -29,6 +29,6 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], # Prerequisites of lib/strtoumax.c. AC_DEFUN([gl_PREREQ_STRTOUMAX], [ - AC_CHECK_DECLS(strtoull) + AC_CHECK_DECLS([strtoull]) AC_REQUIRE([AC_TYPE_UNSIGNED_LONG_LONG_INT]) ]) diff --git a/m4/strverscmp.m4 b/m4/strverscmp.m4 index a3f9aff4b6..becce2bb17 100644 --- a/m4/strverscmp.m4 +++ b/m4/strverscmp.m4 @@ -1,6 +1,5 @@ -# strverscmp.m4 serial 6 -dnl Copyright (C) 2002, 2005, 2006, 2007, 2008 Free Software -dnl Foundation, Inc. +# strverscmp.m4 serial 7 +dnl Copyright (C) 2002, 2005-2009 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. @@ -11,7 +10,7 @@ AC_DEFUN([gl_FUNC_STRVERSCMP], AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_HEADER_STRING_H_DEFAULTS]) - AC_REPLACE_FUNCS(strverscmp) + AC_REPLACE_FUNCS([strverscmp]) if test $ac_cv_func_strverscmp = no; then gl_PREREQ_STRVERSCMP HAVE_STRVERSCMP=0 diff --git a/m4/threadlib.m4 b/m4/threadlib.m4 index 51caf576b3..3dd38aa877 100644 --- a/m4/threadlib.m4 +++ b/m4/threadlib.m4 @@ -1,5 +1,5 @@ -# threadlib.m4 serial 2 (gettext-0.18) -dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. +# threadlib.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2005-2009 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. @@ -45,7 +45,7 @@ AC_DEFUN([gl_THREADLIB_EARLY_BODY], [AC_REQUIRE([AC_GNU_SOURCE])]) dnl Check for multithreading. m4_divert_text([DEFAULTS], [gl_use_threads_default=]) - AC_ARG_ENABLE(threads, + AC_ARG_ENABLE([threads], AC_HELP_STRING([--enable-threads={posix|solaris|pth|win32}], [specify multithreading API]) AC_HELP_STRING([--disable-threads], [build without multithread safety]), [gl_use_threads=$enableval], @@ -131,7 +131,7 @@ AC_DEFUN([gl_THREADLIB_BODY], # pthread_create will actually create a thread. case "$host_os" in solaris* | hpux*) - AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], 1, + AC_DEFINE([PTHREAD_IN_USE_DETECTION_HARD], [1], [Define if the pthread_in_use() detection is hard.]) esac ]) @@ -151,11 +151,11 @@ AC_DEFUN([gl_THREADLIB_BODY], fi if test -n "$gl_have_pthread"; then gl_threads_api=posix - AC_DEFINE([USE_POSIX_THREADS], 1, + AC_DEFINE([USE_POSIX_THREADS], [1], [Define if the POSIX multithreading library can be used.]) if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then if test $gl_have_weak = yes; then - AC_DEFINE([USE_POSIX_THREADS_WEAK], 1, + AC_DEFINE([USE_POSIX_THREADS_WEAK], [1], [Define if references to the POSIX multithreading library should be made weak.]) LIBTHREAD= LTLIBTHREAD= @@ -180,10 +180,10 @@ AC_DEFUN([gl_THREADLIB_BODY], LTLIBTHREAD=-lthread LIBMULTITHREAD="$LIBTHREAD" LTLIBMULTITHREAD="$LTLIBTHREAD" - AC_DEFINE([USE_SOLARIS_THREADS], 1, + AC_DEFINE([USE_SOLARIS_THREADS], [1], [Define if the old Solaris multithreading library can be used.]) if test $gl_have_weak = yes; then - AC_DEFINE([USE_SOLARIS_THREADS_WEAK], 1, + AC_DEFINE([USE_SOLARIS_THREADS_WEAK], [1], [Define if references to the old Solaris multithreading library should be made weak.]) LIBTHREAD= LTLIBTHREAD= @@ -205,11 +205,11 @@ AC_DEFUN([gl_THREADLIB_BODY], LTLIBTHREAD="$LTLIBPTH" LIBMULTITHREAD="$LIBTHREAD" LTLIBMULTITHREAD="$LTLIBTHREAD" - AC_DEFINE([USE_PTH_THREADS], 1, + AC_DEFINE([USE_PTH_THREADS], [1], [Define if the GNU Pth multithreading library can be used.]) if test -n "$LIBMULTITHREAD" || test -n "$LTLIBMULTITHREAD"; then if test $gl_have_weak = yes; then - AC_DEFINE([USE_PTH_THREADS_WEAK], 1, + AC_DEFINE([USE_PTH_THREADS_WEAK], [1], [Define if references to the GNU Pth multithreading library should be made weak.]) LIBTHREAD= LTLIBTHREAD= @@ -227,7 +227,7 @@ AC_DEFUN([gl_THREADLIB_BODY], esac }; then gl_threads_api=win32 - AC_DEFINE([USE_WIN32_THREADS], 1, + AC_DEFINE([USE_WIN32_THREADS], [1], [Define if the Win32 multithreading API can be used.]) fi fi diff --git a/m4/timegm.m4 b/m4/timegm.m4 index ca903b1afc..be323c9b0f 100644 --- a/m4/timegm.m4 +++ b/m4/timegm.m4 @@ -1,5 +1,5 @@ -# timegm.m4 serial 5 -dnl Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# timegm.m4 serial 6 +dnl Copyright (C) 2003, 2007, 2009 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. @@ -13,7 +13,7 @@ AC_DEFUN([gl_FUNC_TIMEGM], AC_LIBOBJ([timegm]) ac_cv_func_timegm=no else - AC_REPLACE_FUNCS(timegm) + AC_REPLACE_FUNCS([timegm]) fi REPLACE_TIMEGM=1 if test $ac_cv_func_timegm = yes; then @@ -29,7 +29,7 @@ AC_DEFUN([gl_PREREQ_TIMEGM], [ AC_REQUIRE([gl_TIME_R]) AC_REQUIRE([gl_FUNC_MKTIME]) if test $ac_cv_func_working_mktime = yes; then - AC_CHECK_FUNC(__mktime_internal, , + AC_CHECK_FUNC([__mktime_internal], , [# mktime works but it doesn't export __mktime_internal, # so we need to substitute our own mktime implementation. AC_LIBOBJ([mktime]) diff --git a/m4/tm_gmtoff.m4 b/m4/tm_gmtoff.m4 index cb0b3c884c..911af0a403 100644 --- a/m4/tm_gmtoff.m4 +++ b/m4/tm_gmtoff.m4 @@ -1,5 +1,5 @@ -# tm_gmtoff.m4 serial 2 -dnl Copyright (C) 2002 Free Software Foundation, Inc. +# tm_gmtoff.m4 serial 3 +dnl Copyright (C) 2002, 2009 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. @@ -7,7 +7,7 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_TM_GMTOFF], [ AC_CHECK_MEMBER([struct tm.tm_gmtoff], - [AC_DEFINE(HAVE_TM_GMTOFF, 1, + [AC_DEFINE([HAVE_TM_GMTOFF], [1], [Define if struct tm has the tm_gmtoff member.])], , [#include <time.h>]) diff --git a/m4/tmpdir.m4 b/m4/tmpdir.m4 index b06402e3e3..254c7e07d4 100644 --- a/m4/tmpdir.m4 +++ b/m4/tmpdir.m4 @@ -1,5 +1,5 @@ -# tmpdir.m4 serial 2 (gettext-0.15) -dnl Copyright (C) 2001-2002, 2006 Free Software Foundation, Inc. +# tmpdir.m4 serial 3 (gettext-0.15) +dnl Copyright (C) 2001-2002, 2006, 2009 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. @@ -8,5 +8,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gt_TMPDIR], [ - AC_CHECK_FUNCS(__secure_getenv) + AC_CHECK_FUNCS([__secure_getenv]) ]) diff --git a/m4/tmpfile.m4 b/m4/tmpfile.m4 index 5dc24b2f39..37e6aaa6a7 100644 --- a/m4/tmpfile.m4 +++ b/m4/tmpfile.m4 @@ -1,6 +1,6 @@ # Check whether to use a replacement tmpfile() function. -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009 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. @@ -28,8 +28,8 @@ choke me [gl_cv_func_tmpfile_unusable=yes], [gl_cv_func_tmpfile_unusable=no])]) if test $gl_cv_func_tmpfile_unusable = yes; then - AC_LIBOBJ(tmpfile) - AC_DEFINE(tmpfile, rpl_tmpfile, + AC_LIBOBJ([tmpfile]) + AC_DEFINE([tmpfile], [rpl_tmpfile], [Define to rpl_tmpfile if the replacement function should be used.]) gl_PREREQ_TMPFILE fi diff --git a/m4/tzset.m4 b/m4/tzset.m4 index b8c111b0ff..4fed1fd7db 100644 --- a/m4/tzset.m4 +++ b/m4/tzset.m4 @@ -1,6 +1,6 @@ -#serial 3 +# serial 4 -# Copyright (C) 2003, 2007 Free Software Foundation, Inc. +# Copyright (C) 2003, 2007, 2009 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. @@ -45,15 +45,15 @@ main () [gl_cv_func_tzset_clobber=yes], [gl_cv_func_tzset_clobber=yes])]) - AC_DEFINE(HAVE_RUN_TZSET_TEST, 1, + AC_DEFINE([HAVE_RUN_TZSET_TEST], [1], [Define to 1 if you have run the test for working tzset.]) if test $gl_cv_func_tzset_clobber = yes; then gl_GETTIMEOFDAY_REPLACE_LOCALTIME - AC_DEFINE(tzset, rpl_tzset, + AC_DEFINE([tzset], [rpl_tzset], [Define to rpl_tzset if the wrapper function should be used.]) - AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], 1, + AC_DEFINE([TZSET_CLOBBERS_LOCALTIME], [1], [Define if tzset clobbers localtime's static buffer.]) fi ]) diff --git a/m4/uintmax_t.m4 b/m4/uintmax_t.m4 index cde46d2e8f..734b6933e2 100644 --- a/m4/uintmax_t.m4 +++ b/m4/uintmax_t.m4 @@ -1,12 +1,12 @@ -# uintmax_t.m4 serial 11 -dnl Copyright (C) 1997-2004, 2007-2008 Free Software Foundation, Inc. +# uintmax_t.m4 serial 12 +dnl Copyright (C) 1997-2004, 2007-2009 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. dnl From Paul Eggert. -AC_PREREQ(2.13) +AC_PREREQ([2.13]) # Define uintmax_t to 'unsigned long' or 'unsigned long long' # if it is not already defined in <stdint.h> or <inttypes.h>. @@ -24,7 +24,7 @@ AC_DEFUN([gl_AC_TYPE_UINTMAX_T], [Define to unsigned long or unsigned long long if <stdint.h> and <inttypes.h> don't define.]) else - AC_DEFINE([HAVE_UINTMAX_T], 1, + AC_DEFINE([HAVE_UINTMAX_T], [1], [Define if you have the 'uintmax_t' type in <stdint.h> or <inttypes.h>.]) fi ]) diff --git a/m4/unlinkdir.m4 b/m4/unlinkdir.m4 index 6ef7168a37..0c84375314 100644 --- a/m4/unlinkdir.m4 +++ b/m4/unlinkdir.m4 @@ -1,6 +1,6 @@ -#serial 5 +# serial 6 -# Copyright (C) 2005, 2006, 2007 Free Software Foundation, Inc. +# Copyright (C) 2005, 2006, 2007, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -11,7 +11,7 @@ AC_DEFUN([gl_UNLINKDIR], [ AC_REQUIRE([AC_CANONICAL_HOST]) - AC_CHECK_HEADERS_ONCE(priv.h) + AC_CHECK_HEADERS_ONCE([priv.h]) AC_LIBOBJ([unlinkdir]) @@ -27,7 +27,7 @@ AC_DEFUN([gl_UNLINKDIR], *-*-linux-* | *-*-linux | \ *-*-freebsd2.2* | *-*-freebsd[[3-9]]* | *-*-freebsd[[1-9]][[0-9]]* | \ *-cygwin) - AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], 1, + AC_DEFINE([UNLINK_CANNOT_UNLINK_DIR], [1], [Define to 1 if unlink (dir) cannot possibly succeed.]);; esac ]) diff --git a/m4/unlocked-io.m4 b/m4/unlocked-io.m4 index 20b2da2da7..cd5079b867 100644 --- a/m4/unlocked-io.m4 +++ b/m4/unlocked-io.m4 @@ -1,7 +1,6 @@ -# unlocked-io.m4 serial 14 +# unlocked-io.m4 serial 15 -# Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2005, 2006 -# Free Software Foundation, Inc. +# Copyright (C) 1998-2006, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -17,7 +16,7 @@ dnl on Solaris 2.6). AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO], [ - AC_DEFINE([USE_UNLOCKED_IO], 1, + AC_DEFINE([USE_UNLOCKED_IO], [1], [Define to 1 if you want getc etc. to use unlocked I/O if available. Unlocked I/O can improve performance in unithreaded apps, but it is not safe for multithreaded apps.]) diff --git a/m4/uptime.m4 b/m4/uptime.m4 index 05c9e5f888..d2fbd350ed 100644 --- a/m4/uptime.m4 +++ b/m4/uptime.m4 @@ -1,23 +1,23 @@ -#serial 7 +# serial 8 -# Copyright (C) 1996, 1999, 2000, 2001, 2004 Free Software Foundation, Inc. +# Copyright (C) 1996, 1999-2001, 2004, 2009 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. -AC_PREREQ(2.13) +AC_PREREQ([2.13]) AC_DEFUN([gl_SYS_PROC_UPTIME], [ dnl Require AC_PROG_CC to see if we're cross compiling. AC_REQUIRE([AC_PROG_CC]) - AC_CACHE_CHECK([for /proc/uptime], gl_cv_have_proc_uptime, + AC_CACHE_CHECK([for /proc/uptime], [gl_cv_have_proc_uptime], [gl_cv_have_proc_uptime=no test -f /proc/uptime \ && test "$cross_compiling" = no \ && cat < /proc/uptime >/dev/null 2>/dev/null \ && gl_cv_have_proc_uptime=yes]) if test $gl_cv_have_proc_uptime = yes; then - AC_DEFINE(HAVE_PROC_UPTIME, 1, + AC_DEFINE([HAVE_PROC_UPTIME], [1], [ Define if your system has the /proc/uptime special file.]) fi ]) diff --git a/m4/userspec.m4 b/m4/userspec.m4 index ce981e94c6..27d84c6821 100644 --- a/m4/userspec.m4 +++ b/m4/userspec.m4 @@ -1,5 +1,5 @@ -#serial 9 -dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc. +# serial 10 +dnl Copyright (C) 2002-2006, 2009 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,5 +9,5 @@ AC_DEFUN([gl_USERSPEC], AC_LIBOBJ([userspec]) dnl Prerequisites of lib/userspec.c. - AC_CHECK_HEADERS_ONCE(sys/param.h) + AC_CHECK_HEADERS_ONCE([sys/param.h]) ]) diff --git a/m4/utimbuf.m4 b/m4/utimbuf.m4 index 9927908ff5..062f736275 100644 --- a/m4/utimbuf.m4 +++ b/m4/utimbuf.m4 @@ -1,6 +1,6 @@ -#serial 8 +# serial 9 -# Copyright (C) 1998, 1999, 2000, 2001, 2003, 2004, 2007 Free Software +# Copyright (C) 1998-2001, 2003-2004, 2007, 2009 Free Software # Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -15,7 +15,7 @@ dnl Some systems have utime.h but don't declare the struct anywhere. AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF], [ - AC_CHECK_HEADERS_ONCE(sys/time.h utime.h) + AC_CHECK_HEADERS_ONCE([sys/time.h utime.h]) AC_CACHE_CHECK([for struct utimbuf], [gl_cv_sys_struct_utimbuf], [AC_COMPILE_IFELSE( [AC_LANG_PROGRAM( @@ -32,7 +32,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_UTIMBUF], [gl_cv_sys_struct_utimbuf=no])]) if test $gl_cv_sys_struct_utimbuf = yes; then - AC_DEFINE(HAVE_STRUCT_UTIMBUF, 1, + AC_DEFINE([HAVE_STRUCT_UTIMBUF], [1], [Define if struct utimbuf is declared -- usually in <utime.h>. Some systems have utime.h but don't declare the struct anywhere. ]) fi diff --git a/m4/utime.m4 b/m4/utime.m4 index 967faa253b..26b5ea90a7 100644 --- a/m4/utime.m4 +++ b/m4/utime.m4 @@ -1,9 +1,9 @@ -#serial 7 +# serial 8 dnl From Jim Meyering dnl Replace the utime function on systems that need it. -# Copyright (C) 1998, 2000, 2001, 2003, 2004 Free Software Foundation, Inc. +# Copyright (C) 1998, 2000-2001, 2003-2004, 2009 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. @@ -14,8 +14,8 @@ AC_DEFUN([gl_FUNC_UTIME], [ AC_REQUIRE([AC_FUNC_UTIME_NULL]) if test $ac_cv_func_utime_null = no; then - AC_LIBOBJ(utime) - AC_DEFINE(utime, rpl_utime, + AC_LIBOBJ([utime]) + AC_DEFINE([utime], [rpl_utime], [Define to rpl_utime if the replacement function should be used.]) gl_PREREQ_UTIME fi @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_UTIME], # Prerequisites of lib/utime.c. AC_DEFUN([gl_PREREQ_UTIME], [ - AC_CHECK_HEADERS_ONCE(utime.h) + AC_CHECK_HEADERS_ONCE([utime.h]) AC_REQUIRE([gl_CHECK_TYPE_STRUCT_UTIMBUF]) gl_FUNC_UTIMES_NULL ]) diff --git a/m4/utimes-null.m4 b/m4/utimes-null.m4 index 8d5c8aef7f..dffa798c42 100644 --- a/m4/utimes-null.m4 +++ b/m4/utimes-null.m4 @@ -1,6 +1,6 @@ -#serial 7 +# serial 8 -# Copyright (C) 1998, 1999, 2001, 2003, 2004, 2006 Free Software +# Copyright (C) 1998-1999, 2001, 2003-2004, 2006, 2009 Free Software # Foundation, Inc. # This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl Shamelessly cloned from acspecific.m4's AC_FUNC_UTIME_NULL, dnl then do case-insensitive s/utime/utimes/. AC_DEFUN([gl_FUNC_UTIMES_NULL], -[AC_CACHE_CHECK(whether utimes accepts a null argument, ac_cv_func_utimes_null, +[AC_CACHE_CHECK([whether utimes accepts a null argument], [ac_cv_func_utimes_null], [rm -f conftest.data; > conftest.data AC_TRY_RUN([ /* In case stat has been defined to rpl_stat, undef it here. */ @@ -34,7 +34,7 @@ return ! (stat ("conftest.data", &s) == 0 rm -f core core.* *.core]) if test $ac_cv_func_utimes_null = yes; then - AC_DEFINE(HAVE_UTIMES_NULL, 1, + AC_DEFINE([HAVE_UTIMES_NULL], [1], [Define if utimes accepts a null argument]) fi ] diff --git a/m4/utimes.m4 b/m4/utimes.m4 index 7efb2b026c..5b010acd8b 100644 --- a/m4/utimes.m4 +++ b/m4/utimes.m4 @@ -1,6 +1,6 @@ # Detect some bugs in glibc's implementation of utimes. -dnl Copyright (C) 2003, 2004, 2005 Free Software Foundation, Inc. +dnl Copyright (C) 2003, 2004, 2005, 2009 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. @@ -78,6 +78,6 @@ main () [gl_cv_func_working_utimes=no])]) if test $gl_cv_func_working_utimes = yes; then - AC_DEFINE([HAVE_WORKING_UTIMES], 1, [Define if utimes works properly. ]) + AC_DEFINE([HAVE_WORKING_UTIMES], [1], [Define if utimes works properly. ]) fi ]) diff --git a/m4/vararrays.m4 b/m4/vararrays.m4 index def6ba457a..192b612274 100644 --- a/m4/vararrays.m4 +++ b/m4/vararrays.m4 @@ -1,10 +1,10 @@ # Check for variable-length arrays. -#serial 2 +# serial 3 # From Paul Eggert -# Copyright (C) 2001 Free Software Foundation, Inc. +# Copyright (C) 2001, 2009 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_C_VARARRAYS], ac_cv_c_vararrays=yes, ac_cv_c_vararrays=no)]) if test $ac_cv_c_vararrays = yes; then - AC_DEFINE(HAVE_C_VARARRAYS, 1, + AC_DEFINE([HAVE_C_VARARRAYS], [1], [Define to 1 if C supports variable-length arrays.]) fi ]) diff --git a/m4/vasnprintf.m4 b/m4/vasnprintf.m4 index 536258c06b..9e839d2bc8 100644 --- a/m4/vasnprintf.m4 +++ b/m4/vasnprintf.m4 @@ -1,5 +1,5 @@ -# vasnprintf.m4 serial 25 -dnl Copyright (C) 2002-2004, 2006-2008 Free Software Foundation, Inc. +# vasnprintf.m4 serial 26 +dnl Copyright (C) 2002-2004, 2006-2009 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. @@ -20,7 +20,7 @@ AC_DEFUN([gl_REPLACE_VASNPRINTF], AC_LIBOBJ([printf-parse]) AC_LIBOBJ([asnprintf]) if test $ac_cv_func_vasnprintf = yes; then - AC_DEFINE([REPLACE_VASNPRINTF], 1, + AC_DEFINE([REPLACE_VASNPRINTF], [1], [Define if vasnprintf exists but is overridden by gnulib.]) fi gl_PREREQ_PRINTF_ARGS @@ -58,7 +58,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF], AC_REQUIRE([AC_TYPE_LONG_LONG_INT]) AC_REQUIRE([gt_TYPE_WCHAR_T]) AC_REQUIRE([gt_TYPE_WINT_T]) - AC_CHECK_FUNCS(snprintf wcslen) + AC_CHECK_FUNCS([snprintf wcslen]) 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 <stdio.h>]) @@ -73,7 +73,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_LONG_DOUBLE], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'long double' arguments.]) ;; @@ -89,7 +89,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_INFINITE_DOUBLE], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_INFINITE_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_INFINITE_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for infinite 'double' arguments.]) ;; @@ -110,7 +110,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_INFINITE_LONG_DOUBLE], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_INFINITE_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_INFINITE_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for infinite 'long double' arguments.]) ;; @@ -127,7 +127,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_A], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], 1, + AC_DEFINE([NEED_PRINTF_DIRECTIVE_A], [1], [Define if the vasnprintf implementation needs special code for the 'a' and 'A' directives.]) AC_CHECK_FUNCS([nl_langinfo]) @@ -143,7 +143,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_DIRECTIVE_F], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_DIRECTIVE_F], 1, + AC_DEFINE([NEED_PRINTF_DIRECTIVE_F], [1], [Define if the vasnprintf implementation needs special code for the 'F' directive.]) ;; @@ -158,7 +158,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_GROUPING], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_FLAG_GROUPING], 1, + AC_DEFINE([NEED_PRINTF_FLAG_GROUPING], [1], [Define if the vasnprintf implementation needs special code for the ' flag.]) ;; @@ -173,7 +173,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_LEFTADJUST], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_FLAG_LEFTADJUST], 1, + AC_DEFINE([NEED_PRINTF_FLAG_LEFTADJUST], [1], [Define if the vasnprintf implementation needs special code for the '-' flag.]) ;; @@ -188,7 +188,7 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_FLAG_ZERO], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_FLAG_ZERO], 1, + AC_DEFINE([NEED_PRINTF_FLAG_ZERO], [1], [Define if the vasnprintf implementation needs special code for the 0 flag.]) ;; @@ -203,13 +203,13 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_PRECISION], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_UNBOUNDED_PRECISION], 1, + AC_DEFINE([NEED_PRINTF_UNBOUNDED_PRECISION], [1], [Define if the vasnprintf implementation needs special code for supporting large precisions without arbitrary bounds.]) - AC_DEFINE([NEED_PRINTF_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'double' arguments.]) - AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'long double' arguments.]) ;; @@ -225,13 +225,13 @@ AC_DEFUN([gl_PREREQ_VASNPRINTF_ENOMEM], *yes) ;; *) - AC_DEFINE([NEED_PRINTF_ENOMEM], 1, + AC_DEFINE([NEED_PRINTF_ENOMEM], [1], [Define if the vasnprintf implementation needs special code for surviving out-of-memory conditions.]) - AC_DEFINE([NEED_PRINTF_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'double' arguments.]) - AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], 1, + AC_DEFINE([NEED_PRINTF_LONG_DOUBLE], [1], [Define if the vasnprintf implementation needs special code for 'long double' arguments.]) ;; diff --git a/m4/vfprintf-posix.m4 b/m4/vfprintf-posix.m4 index 9a815128dd..f795b72558 100644 --- a/m4/vfprintf-posix.m4 +++ b/m4/vfprintf-posix.m4 @@ -1,5 +1,5 @@ -# vfprintf-posix.m4 serial 12 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# vfprintf-posix.m4 serial 13 +dnl Copyright (C) 2007-2009 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. @@ -96,7 +96,7 @@ AC_DEFUN([gl_REPLACE_VFPRINTF], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_LIBOBJ([vfprintf]) REPLACE_VFPRINTF=1 - AC_DEFINE([REPLACE_VFPRINTF_POSIX], 1, + AC_DEFINE([REPLACE_VFPRINTF_POSIX], [1], [Define if vfprintf is overridden by a POSIX compliant gnulib implementation.]) gl_PREREQ_VFPRINTF ]) diff --git a/m4/vprintf-posix.m4 b/m4/vprintf-posix.m4 index 0bc0840a9e..8d461795e1 100644 --- a/m4/vprintf-posix.m4 +++ b/m4/vprintf-posix.m4 @@ -1,5 +1,5 @@ -# vprintf-posix.m4 serial 2 -dnl Copyright (C) 2007-2008 Free Software Foundation, Inc. +# vprintf-posix.m4 serial 3 +dnl Copyright (C) 2007-2009 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. @@ -17,7 +17,7 @@ AC_DEFUN([gl_REPLACE_VPRINTF], AC_REQUIRE([gl_STDIO_H_DEFAULTS]) AC_LIBOBJ([vprintf]) REPLACE_VPRINTF=1 - AC_DEFINE([REPLACE_VPRINTF_POSIX], 1, + AC_DEFINE([REPLACE_VPRINTF_POSIX], [1], [Define if vprintf is overridden by a POSIX compliant gnulib implementation.]) gl_PREREQ_VPRINTF ]) diff --git a/m4/wait-process.m4 b/m4/wait-process.m4 index 8636cba5e3..f03ad76f0f 100644 --- a/m4/wait-process.m4 +++ b/m4/wait-process.m4 @@ -1,5 +1,5 @@ -# wait-process.m4 serial 3 -dnl Copyright (C) 2003, 2008 Free Software Foundation, Inc. +# wait-process.m4 serial 4 +dnl Copyright (C) 2003, 2008, 2009 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. @@ -8,5 +8,5 @@ AC_DEFUN([gl_WAIT_PROCESS], [ dnl Prerequisites of lib/wait-process.c. AC_REQUIRE([gt_TYPE_SIG_ATOMIC_T]) - AC_CHECK_FUNCS(waitid) + AC_CHECK_FUNCS([waitid]) ]) diff --git a/m4/wchar_t.m4 b/m4/wchar_t.m4 index 3c81564adc..fb27a7f65f 100644 --- a/m4/wchar_t.m4 +++ b/m4/wchar_t.m4 @@ -1,5 +1,5 @@ -# wchar_t.m4 serial 2 (gettext-0.18) -dnl Copyright (C) 2002-2003, 2008 Free Software Foundation, Inc. +# wchar_t.m4 serial 3 (gettext-0.18) +dnl Copyright (C) 2002-2003, 2008, 2009 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. @@ -15,6 +15,6 @@ AC_DEFUN([gt_TYPE_WCHAR_T], wchar_t foo = (wchar_t)'\0';], , [gt_cv_c_wchar_t=yes], [gt_cv_c_wchar_t=no])]) if test $gt_cv_c_wchar_t = yes; then - AC_DEFINE([HAVE_WCHAR_T], 1, [Define if you have the 'wchar_t' type.]) + AC_DEFINE([HAVE_WCHAR_T], [1], [Define if you have the 'wchar_t' type.]) fi ]) diff --git a/m4/wint_t.m4 b/m4/wint_t.m4 index 0026a13188..47a4363d79 100644 --- a/m4/wint_t.m4 +++ b/m4/wint_t.m4 @@ -1,5 +1,5 @@ -# wint_t.m4 serial 3 (gettext-0.18) -dnl Copyright (C) 2003, 2007-2008 Free Software Foundation, Inc. +# wint_t.m4 serial 4 (gettext-0.18) +dnl Copyright (C) 2003, 2007-2009 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. @@ -23,6 +23,6 @@ AC_DEFUN([gt_TYPE_WINT_T], wint_t foo = (wchar_t)'\0';], , [gt_cv_c_wint_t=yes], [gt_cv_c_wint_t=no])]) if test $gt_cv_c_wint_t = yes; then - AC_DEFINE([HAVE_WINT_T], 1, [Define if you have the 'wint_t' type.]) + AC_DEFINE([HAVE_WINT_T], [1], [Define if you have the 'wint_t' type.]) fi ]) diff --git a/m4/write-any-file.m4 b/m4/write-any-file.m4 index 26c6ce05da..61853e5da2 100644 --- a/m4/write-any-file.m4 +++ b/m4/write-any-file.m4 @@ -1,6 +1,6 @@ # Determine whether we can write any file. -# Copyright (C) 2007 Free Software Foundation, Inc. +# Copyright (C) 2007, 2009 Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation # gives unlimited permission to copy and/or distribute it, @@ -10,6 +10,6 @@ AC_DEFUN([gl_WRITE_ANY_FILE], [ - AC_CHECK_HEADERS_ONCE(priv.h) + AC_CHECK_HEADERS_ONCE([priv.h]) AC_LIBOBJ([write-any-file]) ]) diff --git a/m4/yield.m4 b/m4/yield.m4 index 8701a86701..bbd9199853 100644 --- a/m4/yield.m4 +++ b/m4/yield.m4 @@ -1,5 +1,5 @@ -# yield.m4 serial 1 -dnl Copyright (C) 2005-2008 Free Software Foundation, Inc. +# yield.m4 serial 2 +dnl Copyright (C) 2005-2009 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. @@ -11,9 +11,9 @@ AC_DEFUN([gl_YIELD], YIELD_LIB= if test $gl_threads_api = posix; then dnl Solaris has sched_yield in librt, not in libpthread or libc. - AC_CHECK_LIB(rt, sched_yield, [YIELD_LIB=-lrt], + AC_CHECK_LIB([rt], [sched_yield], [YIELD_LIB=-lrt], [dnl Solaris 2.5.1, 2.6 has sched_yield in libposix4, not librt. - AC_CHECK_LIB(posix4, sched_yield, [YIELD_LIB=-lposix4])]) + AC_CHECK_LIB([posix4], [sched_yield], [YIELD_LIB=-lposix4])]) fi AC_SUBST([YIELD_LIB]) ]) |