Bruno Haible <[EMAIL PROTECTED]> writes:
> I also propose a similar comment to extensions.m4, see below.
Thanks, I installed that.
> + But about AC_CHECK_DECLS_ONCE: note that in
> + autoconf >= 2.60 the symbol separator is a comma, whereas here it is
> + whitespace.
I hadn't noticed this incompatibility. It is a real hassle. I
suppose it's better to have AC_CHECK_DECLS_ONCE to resemble Autoconf's
longstanding AC_CHECK_DECLS macro (which uses commas), but I don't
like changing a longstanding Gnulib tradition either. Ouch. Perhaps
the Gnulib macro should be renamed to gl_CHECK_DECLS_ONCE, for macros
that want to use the Gnulib tradition? (I vaguely recall having this
discussion before....)
I scanned Gnulib for other issues related to Autoconf 2.60, and
have the following thoughts.
gnulib-tool assumes Autoconf 2.57 through 2.59, since it copies
m4/onceonly_2_57.m4. I think we should modify it to assume 2.60, once
2.60 comes out. People who want to maintain packages that assume
older Autoconf releases can copy m4/onceonly_2_57.m4 by hand.
If we could assume Autoconf 2.60, we could remove the following files,
modules/assert
modules/extensions
m4/assert.m4
m4/d-ino.m4
m4/extensions.m4
m4/onceonly.m4
m4/onceonly_2_57.m4
and install something like the following patch (this is incomplete, but
it gives a feeling for the sort of thing involved):
Index: gnulib-tool
===================================================================
RCS file: /cvsroot/gnulib/gnulib/gnulib-tool,v
retrieving revision 1.107
diff -p -u -b -r1.107 gnulib-tool
--- gnulib-tool 13 Feb 2006 15:40:25 -0000 1.107
+++ gnulib-tool 19 Apr 2006 23:50:06 -0000
@@ -530,7 +530,7 @@ func_get_filelist ()
{
sed -n -e "/^Files$sed_extract_prog" < "$gnulib_dir/modules/$1"
#echo m4/onceonly.m4
- echo m4/onceonly_2_57.m4
+ #echo m4/onceonly_2_57.m4
}
# func_get_dependencies module
@@ -1316,8 +1316,8 @@ func_import ()
if grep AC_GNU_SOURCE "$destdir"/$m4base/*.m4 > /dev/null; then
echo " AC_REQUIRE([AC_GNU_SOURCE])"
fi
- if grep gl_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then
- echo " AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])"
+ if grep AC_USE_SYSTEM_EXTENSIONS "$destdir"/$m4base/*.m4 > /dev/null; then
+ echo " AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])"
fi
if grep gl_LOCK "$destdir"/$m4base/*.m4 > /dev/null; then
echo " AC_REQUIRE([gl_LOCK])"
@@ -1546,8 +1546,8 @@ func_create_testdir ()
echo "AC_GNU_SOURCE"
echo
fi
- if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
- echo "gl_USE_SYSTEM_EXTENSIONS"
+ if grep AC_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
+ echo "AC_USE_SYSTEM_EXTENSIONS"
echo
fi
if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
@@ -1627,8 +1627,8 @@ func_create_testdir ()
echo "AC_GNU_SOURCE"
echo
fi
- if grep gl_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
- echo "gl_USE_SYSTEM_EXTENSIONS"
+ if grep AC_USE_SYSTEM_EXTENSIONS "$testdir"/m4/*.m4 > /dev/null; then
+ echo "AC_USE_SYSTEM_EXTENSIONS"
echo
fi
if grep gl_LOCK "$testdir"/m4/*.m4 > /dev/null; then
Index: lib/backupfile.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/backupfile.c,v
retrieving revision 1.47
diff -p -u -b -r1.47 backupfile.c
--- lib/backupfile.c 23 Sep 2005 04:15:13 -0000 1.47
+++ lib/backupfile.c 19 Apr 2006 23:50:06 -0000
@@ -63,7 +63,7 @@
# define HAVE_DIR 0
#endif
-#if D_INO_IN_DIRENT
+#if HAVE_STRUCT_DIRENT_D_INO
# define REAL_DIR_ENTRY(dp) ((dp)->d_ino != 0)
#else
# define REAL_DIR_ENTRY(dp) 1
Index: lib/c-strtod.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/c-strtod.c,v
retrieving revision 1.5
diff -p -u -b -r1.5 c-strtod.c
--- lib/c-strtod.c 14 May 2005 06:03:57 -0000 1.5
+++ lib/c-strtod.c 19 Apr 2006 23:50:06 -0000
@@ -40,7 +40,7 @@
#endif
/* c_strtold falls back on strtod if strtold doesn't conform to C99. */
-#if LONG && HAVE_C99_STRTOLD
+#if LONG && HAVE_STRTOLD
# define STRTOD strtold
#else
# define STRTOD strtod
Index: lib/getcwd.c
===================================================================
RCS file: /cvsroot/gnulib/gnulib/lib/getcwd.c,v
retrieving revision 1.11
diff -p -u -b -r1.11 getcwd.c
--- lib/getcwd.c 21 Feb 2006 06:40:34 -0000 1.11
+++ lib/getcwd.c 19 Apr 2006 23:50:06 -0000
@@ -103,7 +103,7 @@
# endif
#endif
-#if D_INO_IN_DIRENT
+#if HAVE_STRUCT_DIRENT_D_INO
# define MATCHING_INO(dp, ino) ((dp)->d_ino == (ino))
#else
# define MATCHING_INO(dp, ino) true
Index: m4/argp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/argp.m4,v
retrieving revision 1.8
diff -p -u -b -r1.8 argp.m4
--- m4/argp.m4 10 Dec 2005 21:37:44 -0000 1.8
+++ m4/argp.m4 19 Apr 2006 23:50:06 -0000
@@ -7,7 +7,7 @@ dnl with or without modifications, as lo
AC_DEFUN([gl_ARGP],
[
AC_REQUIRE([AC_C_INLINE])
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_GETOPT_SUBSTITUTE])
AC_CHECK_DECL([program_invocation_name],
@@ -44,10 +44,10 @@ AC_DEFUN([gl_ARGP],
[ AC_MSG_RESULT(no)] )
AC_CHECK_DECLS_ONCE(
- [clearerr_unlocked feof_unlocked ferror_unlocked
- fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
- fread_unlocked fwrite_unlocked getc_unlocked
- getchar_unlocked putc_unlocked putchar_unlocked])
+ [clearerr_unlocked, feof_unlocked, ferror_unlocked,
+ fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked,
+ fread_unlocked, fwrite_unlocked, getc_unlocked,
+ getchar_unlocked, putc_unlocked, putchar_unlocked])
AC_CHECK_FUNCS_ONCE([flockfile funlockfile])
AC_CHECK_HEADERS_ONCE([features.h linewrap.h])
])
Index: m4/backupfile.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/backupfile.m4,v
retrieving revision 1.10
diff -p -u -b -r1.10 backupfile.m4
--- m4/backupfile.m4 23 Sep 2005 04:15:13 -0000 1.10
+++ m4/backupfile.m4 19 Apr 2006 23:50:06 -0000
@@ -11,7 +11,7 @@ AC_DEFUN([gl_BACKUPFILE],
dnl Prerequisites of lib/backupfile.c.
AC_REQUIRE([AC_HEADER_DIRENT])
- AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
+ AC_REQUIRE([AC_STRUCT_DIRENT_D_INO])
AC_REQUIRE([gl_AC_DOS])
AC_REQUIRE([AC_SYS_LONG_FILE_NAMES])
AC_CHECK_FUNCS_ONCE([pathconf])
Index: m4/c-strtod.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/c-strtod.m4,v
retrieving revision 1.4
diff -p -u -b -r1.4 c-strtod.m4
--- m4/c-strtod.m4 21 Mar 2005 22:06:27 -0000 1.4
+++ m4/c-strtod.m4 19 Apr 2006 23:50:06 -0000
@@ -7,39 +7,13 @@
# Written by Paul Eggert.
-AC_DEFUN([gl_C99_STRTOLD],
-[
- AC_CACHE_CHECK([whether strtold conforms to C99],
- [gl_cv_func_c99_strtold],
- [AC_COMPILE_IFELSE(
- [AC_LANG_PROGRAM(
- [[/* On HP-UX before 11.23, strtold returns a struct instead of
- long double. Reject implementations like that, by requiring
- compatibility with the C99 prototype. */
- #include <stdlib.h>
- static long double (*p) (char const *, char **) = strtold;
- static long double
- test (char const *nptr, char **endptr)
- {
- long double r;
- r = strtold (nptr, endptr);
- return r;
- }]],
- [[return test ("1.0", NULL) != 1 || p ("1.0", NULL) != 1;]])],
- [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.])
- fi
-])
-
AC_DEFUN([gl_C_STRTOD],
[
AC_LIBSOURCES([c-strtod.c, c-strtod.h])
AC_LIBOBJ([c-strtod])
dnl Prerequisites of lib/c-strtod.c.
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
:
])
@@ -50,6 +24,6 @@ AC_DEFUN([gl_C_STRTOLD],
dnl Prerequisites of lib/c-strtold.c.
AC_REQUIRE([gl_C_STRTOD])
- AC_REQUIRE([gl_C99_STRTOLD])
+ AC_REQUIRE([AC_FUNC_STRTOLD])
:
])
Index: m4/clock_time.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/clock_time.m4,v
retrieving revision 1.7
diff -p -u -b -r1.7 clock_time.m4
--- m4/clock_time.m4 2 Mar 2006 07:36:41 -0000 1.7
+++ m4/clock_time.m4 19 Apr 2006 23:50:06 -0000
@@ -1,4 +1,4 @@
-# clock_time.m4 serial 7
+# clock_time.m4 serial 8
dnl Copyright (C) 2002, 2003, 2004, 2005, 2006 Free Software Foundation, Inc.
dnl This file is free software; the Free Software Foundation
dnl gives unlimited permission to copy and/or distribute it,
@@ -8,7 +8,7 @@ dnl with or without modifications, as lo
AC_DEFUN([gl_CLOCK_TIME],
[
dnl Persuade glibc and Solaris <time.h> to declare these functions.
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
# Solaris 2.5.1 needs -lposix4 to get the clock_gettime function.
# Solaris 7 prefers the library name -lrt to the obsolescent name -lposix4.
Index: m4/euidaccess.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/euidaccess.m4,v
retrieving revision 1.5
diff -p -u -b -r1.5 euidaccess.m4
--- m4/euidaccess.m4 2 May 2005 07:00:50 -0000 1.5
+++ m4/euidaccess.m4 19 Apr 2006 23:50:06 -0000
@@ -30,7 +30,7 @@ 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_DECLS_ONCE([setregid])
AC_REQUIRE([AC_FUNC_GETGROUPS])
# Solaris 9 needs -lgen to get the eaccess function.
Index: m4/getcwd-path-max.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getcwd-path-max.m4,v
retrieving revision 1.7
diff -p -u -b -r1.7 getcwd-path-max.m4
--- m4/getcwd-path-max.m4 2 Jul 2005 09:58:35 -0000 1.7
+++ m4/getcwd-path-max.m4 19 Apr 2006 23:50:06 -0000
@@ -15,8 +15,8 @@
AC_DEFUN([gl_FUNC_GETCWD_PATH_MAX],
[
- AC_CHECK_DECLS_ONCE(getcwd)
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_CHECK_DECLS_ONCE([getcwd])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CACHE_CHECK([whether getcwd handles long file names properly],
gl_cv_func_getcwd_path_max,
[# Arrange for deletion of the temporary directory this test creates.
Index: m4/getcwd.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getcwd.m4,v
retrieving revision 1.9
diff -p -u -b -r1.9 getcwd.m4
--- m4/getcwd.m4 23 Sep 2005 04:15:13 -0000 1.9
+++ m4/getcwd.m4 19 Apr 2006 23:50:06 -0000
@@ -57,8 +57,8 @@ AC_DEFUN([gl_FUNC_GETCWD],
# Prerequisites of lib/getcwd.c.
AC_DEFUN([gl_PREREQ_GETCWD],
[
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([AC_HEADER_DIRENT])
- AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_INO])
+ AC_REQUIRE([AC_STRUCT_DIRENT_D_INO])
:
])
Index: m4/getdelim.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getdelim.m4,v
retrieving revision 1.1
diff -p -u -b -r1.1 getdelim.m4
--- m4/getdelim.m4 2 Aug 2005 09:33:30 -0000 1.1
+++ m4/getdelim.m4 19 Apr 2006 23:50:06 -0000
@@ -16,7 +16,7 @@ AC_DEFUN([gl_FUNC_GETDELIM],
AC_REQUIRE([AC_GNU_SOURCE])
AC_REPLACE_FUNCS(getdelim)
- AC_CHECK_DECLS_ONCE(getdelim)
+ AC_CHECK_DECLS_ONCE([getdelim])
if test $ac_cv_func_getdelim = no; then
gl_PREREQ_GETDELIM
Index: m4/gethrxtime.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/gethrxtime.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 gethrxtime.m4
--- m4/gethrxtime.m4 10 Nov 2005 20:19:38 -0000 1.2
+++ m4/gethrxtime.m4 19 Apr 2006 23:50:06 -0000
@@ -10,7 +10,7 @@ AC_DEFUN([gl_GETHRXTIME],
[
AC_LIBSOURCES([gethrxtime.c, gethrxtime.h, xtime.h])
AC_REQUIRE([gl_ARITHMETIC_HRTIME_T])
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_XTIME])
AC_CHECK_DECLS([gethrtime], [], [], [#include <time.h>])
case $ac_cv_have_decl_gethrtime,$gl_cv_arithmetic_hrtime_t in
@@ -26,7 +26,7 @@ AC_DEFUN([gl_GETHRXTIME],
# not having a long long int type).
AC_DEFUN([gl_ARITHMETIC_HRTIME_T],
[
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CACHE_CHECK([for arithmetic hrtime_t], gl_cv_arithmetic_hrtime_t,
[AC_COMPILE_IFELSE(
[AC_LANG_PROGRAM([#include <time.h>],
@@ -51,7 +51,7 @@ AC_DEFUN([gl_XTIME],
AC_DEFUN([gl_PREREQ_GETHRXTIME],
[
AC_REQUIRE([gl_CLOCK_TIME])
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CHECK_FUNCS_ONCE(microuptime nanouptime)
if test $ac_cv_func_nanouptime != yes; then
Index: m4/getlogin_r.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getlogin_r.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 getlogin_r.m4
--- m4/getlogin_r.m4 4 Sep 2005 00:05:33 -0000 1.2
+++ m4/getlogin_r.m4 19 Apr 2006 23:50:06 -0000
@@ -29,5 +29,5 @@ AC_DEFUN([gl_GETLOGIN_R],
AC_DEFUN([gl_PREREQ_GETLOGIN_R],
[
AC_CHECK_HEADERS_ONCE([unistd.h])
- AC_CHECK_DECLS_ONCE([getlogin getlogin_r])
+ AC_CHECK_DECLS_ONCE([getlogin, getlogin_r])
])
Index: m4/getpass.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getpass.m4,v
retrieving revision 1.11
diff -p -u -b -r1.11 getpass.m4
--- m4/getpass.m4 25 Aug 2005 21:19:07 -0000 1.11
+++ m4/getpass.m4 19 Apr 2006 23:50:06 -0000
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_GETPASS],
AC_LIBSOURCES([getpass.c, getpass.h])
AC_REPLACE_FUNCS(getpass)
- AC_CHECK_DECLS_ONCE(getpass)
+ AC_CHECK_DECLS_ONCE([getpass])
if test $ac_cv_func_getpass = no; then
gl_PREREQ_GETPASS
fi
@@ -22,7 +22,7 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU],
[
AC_LIBSOURCES([getpass.c, getpass.h])
- AC_CHECK_DECLS_ONCE(getpass)
+ AC_CHECK_DECLS_ONCE([getpass])
dnl TODO: Detect when GNU getpass() is already found in glibc.
AC_LIBOBJ(getpass)
gl_PREREQ_GETPASS
@@ -37,5 +37,6 @@ AC_DEFUN([gl_FUNC_GETPASS_GNU],
AC_DEFUN([gl_PREREQ_GETPASS], [
AC_CHECK_HEADERS_ONCE(stdio_ext.h termios.h)
AC_CHECK_FUNCS_ONCE(__fsetlocking tcgetattr tcsetattr)
- AC_CHECK_DECLS_ONCE([fflush_unlocked flockfile fputs_unlocked funlockfile
putc_unlocked])
+ AC_CHECK_DECLS_ONCE(
+ [fflush_unlocked, flockfile, fputs_unlocked, funlockfile, putc_unlocked])
])
Index: m4/getsubopt.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/getsubopt.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 getsubopt.m4
--- m4/getsubopt.m4 23 Jan 2005 08:06:57 -0000 1.2
+++ m4/getsubopt.m4 19 Apr 2006 23:50:06 -0000
@@ -1,13 +1,13 @@
-# getsubopt.m4 serial 2
-dnl Copyright (C) 2004 Free Software Foundation, Inc.
+# getsubopt.m4 serial 3
+dnl Copyright (C) 2004, 2006 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_GETSUBOPT],
[
- dnl Persuade glibc <stdlib.h> to declare getsubopt().
- AC_REQUIRE([AC_GNU_SOURCE])
+ dnl Persuade glibc and Solaris <stdlib.h> to declare getsubopt().
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REPLACE_FUNCS(getsubopt)
if test $ac_cv_func_getsubopt = no; then
Index: m4/glob.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/glob.m4,v
retrieving revision 1.5
diff -p -u -b -r1.5 glob.m4
--- m4/glob.m4 13 Sep 2005 03:47:45 -0000 1.5
+++ m4/glob.m4 19 Apr 2006 23:50:06 -0000
@@ -72,7 +72,7 @@ if (glob ("conf*-globtest", 0, NULL, &fo
# Prerequisites of lib/glob.*.
AC_DEFUN([gl_PREREQ_GLOB],
-[ AC_REQUIRE([gl_CHECK_TYPE_STRUCT_DIRENT_D_TYPE])dnl
+[ AC_REQUIRE([AC_STRUCT_DIRENT_D_TYPE])dnl
AC_REQUIRE([AC_GNU_SOURCE])dnl
AC_REQUIRE([AC_HEADER_DIRENT])dnl
AC_CHECK_HEADERS_ONCE([sys/cdefs.h unistd.h])dnl
Index: m4/localcharset.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/localcharset.m4,v
retrieving revision 1.4
diff -p -u -b -r1.4 localcharset.m4
--- m4/localcharset.m4 10 Jan 2006 13:57:21 -0000 1.4
+++ m4/localcharset.m4 19 Apr 2006 23:50:06 -0000
@@ -9,7 +9,7 @@ AC_DEFUN([gl_LOCALCHARSET],
dnl Prerequisites of lib/localcharset.c.
AC_CHECK_HEADERS_ONCE(stddef.h stdlib.h string.h)
AC_REQUIRE([AM_LANGINFO_CODESET])
- AC_CHECK_DECLS_ONCE(getc_unlocked)
+ AC_CHECK_DECLS_ONCE([getc_unlocked])
AC_CHECK_FUNCS_ONCE(setlocale)
dnl Prerequisites of the lib/Makefile.am snippet.
Index: m4/memmem.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/memmem.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 memmem.m4
--- m4/memmem.m4 23 Jan 2005 08:06:57 -0000 1.2
+++ m4/memmem.m4 19 Apr 2006 23:50:06 -0000
@@ -10,7 +10,7 @@ AC_DEFUN([gl_FUNC_MEMMEM],
AC_REQUIRE([AC_GNU_SOURCE])
AC_REPLACE_FUNCS(memmem)
- AC_CHECK_DECLS_ONCE(memmem)
+ AC_CHECK_DECLS_ONCE([memmem])
gl_PREREQ_MEMMEM
])
Index: m4/mkstemp.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/mkstemp.m4,v
retrieving revision 1.16
diff -p -u -b -r1.16 mkstemp.m4
--- m4/mkstemp.m4 23 Sep 2005 04:15:13 -0000 1.16
+++ m4/mkstemp.m4 19 Apr 2006 23:50:06 -0000
@@ -67,6 +67,6 @@ AC_DEFUN([gl_PREREQ_TEMPNAME],
[
AC_CHECK_HEADERS_ONCE(sys/time.h)
AC_CHECK_FUNCS(__secure_getenv gettimeofday)
- AC_CHECK_DECLS_ONCE(getenv)
+ AC_CHECK_DECLS_ONCE([getenv])
AC_REQUIRE([gl_AC_TYPE_UINTMAX_T])
])
Index: m4/nanosleep.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/nanosleep.m4,v
retrieving revision 1.22
diff -p -u -b -r1.22 nanosleep.m4
--- m4/nanosleep.m4 2 Mar 2006 07:36:41 -0000 1.22
+++ m4/nanosleep.m4 19 Apr 2006 23:50:06 -0000
@@ -1,4 +1,4 @@
-#serial 15
+#serial 16
dnl From Jim Meyering.
dnl Check for the nanosleep function.
@@ -29,7 +29,7 @@ AC_DEFUN([gl_FUNC_NANOSLEEP],
jm_cv_func_nanosleep_works,
[
dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([AC_HEADER_TIME])
AC_CHECK_HEADERS_ONCE(sys/time.h)
Index: m4/openat.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/openat.m4,v
retrieving revision 1.5
diff -p -u -b -r1.5 openat.m4
--- m4/openat.m4 24 Jan 2006 19:15:21 -0000 1.5
+++ m4/openat.m4 19 Apr 2006 23:50:06 -0000
@@ -18,7 +18,7 @@ AC_DEFUN([gl_FUNC_OPENAT],
AC_LIBOBJ([mkdirat])
AC_LIBOBJ([openat-die])
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CHECK_FUNCS_ONCE([fdopendir])
AC_REPLACE_FUNCS(openat)
case $ac_cv_func_openat in
Index: m4/snprintf.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/snprintf.m4,v
retrieving revision 1.3
diff -p -u -b -r1.3 snprintf.m4
--- m4/snprintf.m4 23 Jan 2005 08:06:57 -0000 1.3
+++ m4/snprintf.m4 19 Apr 2006 23:50:06 -0000
@@ -7,7 +7,7 @@ dnl with or without modifications, as lo
AC_DEFUN([gl_FUNC_SNPRINTF],
[
AC_REPLACE_FUNCS(snprintf)
- AC_CHECK_DECLS_ONCE(snprintf)
+ AC_CHECK_DECLS_ONCE([snprintf])
gl_PREREQ_SNPRINTF
])
Index: m4/stat-time.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/stat-time.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 stat-time.m4
--- m4/stat-time.m4 7 Dec 2005 18:18:33 -0000 1.2
+++ m4/stat-time.m4 19 Apr 2006 23:50:06 -0000
@@ -18,7 +18,7 @@ AC_DEFUN([gl_STAT_TIME],
AC_LIBSOURCES([stat-time.h])
AC_REQUIRE([AC_C_INLINE])
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CHECK_MEMBERS([struct stat.st_atim.tv_nsec],
[AC_CACHE_CHECK([whether struct stat.st_atim is of type struct timespec],
Index: m4/strdup.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strdup.m4,v
retrieving revision 1.6
diff -p -u -b -r1.6 strdup.m4
--- m4/strdup.m4 21 Mar 2005 22:06:27 -0000 1.6
+++ m4/strdup.m4 19 Apr 2006 23:50:06 -0000
@@ -9,7 +9,7 @@ AC_DEFUN([gl_FUNC_STRDUP],
AC_LIBSOURCES([strdup.c, strdup.h])
AC_REPLACE_FUNCS(strdup)
- AC_CHECK_DECLS_ONCE(strdup)
+ AC_CHECK_DECLS_ONCE([strdup])
gl_PREREQ_STRDUP
])
Index: m4/strnlen.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strnlen.m4,v
retrieving revision 1.7
diff -p -u -b -r1.7 strnlen.m4
--- m4/strnlen.m4 11 Aug 2005 09:56:12 -0000 1.7
+++ m4/strnlen.m4 19 Apr 2006 23:50:06 -0000
@@ -25,5 +25,5 @@ AC_DEFUN([gl_FUNC_STRNLEN],
# Prerequisites of lib/strnlen.c.
AC_DEFUN([gl_PREREQ_STRNLEN], [
- AC_CHECK_DECLS_ONCE(strnlen)
+ AC_CHECK_DECLS_ONCE([strnlen])
])
Index: m4/strtok_r.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/strtok_r.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 strtok_r.m4
--- m4/strtok_r.m4 23 Jan 2005 08:06:57 -0000 1.2
+++ m4/strtok_r.m4 19 Apr 2006 23:50:06 -0000
@@ -7,7 +7,7 @@ dnl with or without modifications, as lo
AC_DEFUN([gl_FUNC_STRTOK_R],
[
AC_REPLACE_FUNCS(strtok_r)
- AC_CHECK_DECLS_ONCE(strtok_r)
+ AC_CHECK_DECLS_ONCE([strtok_r])
gl_PREREQ_STRTOK_R
])
Index: m4/time_r.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/time_r.m4,v
retrieving revision 1.3
diff -p -u -b -r1.3 time_r.m4
--- m4/time_r.m4 12 Apr 2006 07:11:09 -0000 1.3
+++ m4/time_r.m4 19 Apr 2006 23:50:06 -0000
@@ -10,7 +10,7 @@ dnl Written by Paul Eggert.
AC_DEFUN([gl_TIME_R],
[
AC_LIBSOURCES([time_r.c, time_r.h])
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([gl_C_RESTRICT])
AC_CACHE_CHECK([whether localtime_r is compatible with its POSIX signature],
Index: m4/timespec.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/timespec.m4,v
retrieving revision 1.12
diff -p -u -b -r1.12 timespec.m4
--- m4/timespec.m4 2 Mar 2006 07:36:41 -0000 1.12
+++ m4/timespec.m4 19 Apr 2006 23:50:06 -0000
@@ -1,4 +1,4 @@
-#serial 12
+#serial 13
# Copyright (C) 2000, 2001, 2003, 2004, 2005, 2006 Free Software
# Foundation, Inc.
@@ -20,7 +20,7 @@ AC_DEFUN([gl_TIMESPEC],
gl_CHECK_TYPE_STRUCT_TIMESPEC
dnl Persuade glibc and Solaris <time.h> to declare nanosleep.
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CHECK_DECLS(nanosleep, , , [#include <time.h>])
])
@@ -31,7 +31,7 @@ dnl in time.h or sys/time.h.
AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
[
dnl Persuade pedantic Solaris to declare struct timespec.
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_REQUIRE([AC_HEADER_TIME])
AC_CHECK_HEADERS_ONCE(sys/time.h)
Index: m4/unlocked-io.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/unlocked-io.m4,v
retrieving revision 1.6
diff -p -u -b -r1.6 unlocked-io.m4
--- m4/unlocked-io.m4 21 Mar 2005 22:06:27 -0000 1.6
+++ m4/unlocked-io.m4 19 Apr 2006 23:50:06 -0000
@@ -26,11 +26,11 @@ AC_DEFUN([gl_FUNC_GLIBC_UNLOCKED_IO],
dnl Persuade glibc and Solaris <stdio.h> to declare
dnl fgets_unlocked(), fputs_unlocked() etc.
- AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+ AC_REQUIRE([AC_USE_SYSTEM_EXTENSIONS])
AC_CHECK_DECLS_ONCE(
- [clearerr_unlocked feof_unlocked ferror_unlocked
- fflush_unlocked fgets_unlocked fputc_unlocked fputs_unlocked
- fread_unlocked fwrite_unlocked getc_unlocked
- getchar_unlocked putc_unlocked putchar_unlocked])
+ [clearerr_unlocked, feof_unlocked, ferror_unlocked,
+ fflush_unlocked, fgets_unlocked, fputc_unlocked, fputs_unlocked,
+ fread_unlocked, fwrite_unlocked, getc_unlocked,
+ getchar_unlocked, putc_unlocked, putchar_unlocked])
])
Index: m4/vsnprintf.m4
===================================================================
RCS file: /cvsroot/gnulib/gnulib/m4/vsnprintf.m4,v
retrieving revision 1.2
diff -p -u -b -r1.2 vsnprintf.m4
--- m4/vsnprintf.m4 23 Jan 2005 08:06:57 -0000 1.2
+++ m4/vsnprintf.m4 19 Apr 2006 23:50:06 -0000
@@ -7,7 +7,7 @@ dnl with or without modifications, as lo
AC_DEFUN([gl_FUNC_VSNPRINTF],
[
AC_REPLACE_FUNCS(vsnprintf)
- AC_CHECK_DECLS_ONCE(vsnprintf)
+ AC_CHECK_DECLS_ONCE([vsnprintf])
gl_PREREQ_VSNPRINTF
])
Index: modules/backupfile
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/backupfile,v
retrieving revision 1.7
diff -p -u -b -r1.7 backupfile
--- modules/backupfile 6 May 2005 17:22:45 -0000 1.7
+++ modules/backupfile 19 Apr 2006 23:50:06 -0000
@@ -6,7 +6,6 @@ Files:
lib/backupfile.h
lib/backupfile.c
m4/dos.m4
-m4/d-ino.m4
m4/backupfile.m4
Depends-on:
Index: modules/getcwd
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getcwd,v
retrieving revision 1.7
diff -p -u -b -r1.7 getcwd
--- modules/getcwd 6 May 2005 17:22:45 -0000 1.7
+++ modules/getcwd 19 Apr 2006 23:50:06 -0000
@@ -4,7 +4,6 @@ Return the current working directory.
Files:
lib/getcwd.h
lib/getcwd.c
-m4/d-ino.m4
m4/getcwd-path-max.m4
m4/getcwd.m4
Index: modules/getsubopt
===================================================================
RCS file: /cvsroot/gnulib/gnulib/modules/getsubopt,v
retrieving revision 1.2
diff -p -u -b -r1.2 getsubopt
--- modules/getsubopt 22 Sep 2004 15:11:04 -0000 1.2
+++ modules/getsubopt 19 Apr 2006 23:50:06 -0000
@@ -8,6 +8,7 @@ m4/getsubopt.m4
Depends-on:
strchrnul
+extensions
configure.ac:
gl_FUNC_GETSUBOPT
