From: Bruno Haible Date: Thu, 25 Jan 2007 03:25:54 +0000 (+0000) Subject: 2007-01-24 Bruno Haible X-Git-Tag: cvs-readonly~1276 X-Git-Url: http://erislabs.org.uk/gitweb/?a=commitdiff_plain;h=f67b37c4af9923c0c70cf79d9b56b7fbcf2c97c3;p=gnulib.git 2007-01-24 Bruno Haible Don't AC_REQUIRE autoconf macros that invoke AC_LIBOBJ. See . * m4/argp.m4 (gl_ARGP): Invoke, don't require, gl_GETOPT_SUBSTITUTE. * m4/fts.m4 (gl_FUNC_FTS, gl_FUNC_FTS_LGPL): Invoke, don't require, gl_FUNC_FTS_CORE. (gl_FUNC_FTS_CORE): Invoke, don't require, gl_FUNC_OPENAT. * m4/lstat.m4 (gl_FUNC_LSTAT): Invoke, don't require, AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK. * m4/memcmp.m4 (gl_FUNC_MEMCMP): Invoke, don't require, AC_FUNC_MEMCMP. * m4/mktime.m4 (gl_FUNC_MKTIME): Invoke, don't require, AC_FUNC_MKTIME. * m4/openat.m4 (gl_FUNC_OPENAT): Invoke, don't require, gl_FUNC_FCHOWNAT. * m4/strftime.m4 (gl_FUNC_GNU_STRFTIME): Invoke, don't require, gl_FUNC_STRFTIME. * m4/strtod.m4 (gl_FUNC_STRTOD): Invoke, don't require, AC_FUNC_STRTOD. Reported by Ralf Wildenhues. --- diff --git a/ChangeLog b/ChangeLog index d7486b402..33b079b2b 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,5 +1,24 @@ 2007-01-24 Bruno Haible + Don't AC_REQUIRE autoconf macros that invoke AC_LIBOBJ. See + . + * m4/argp.m4 (gl_ARGP): Invoke, don't require, gl_GETOPT_SUBSTITUTE. + * m4/fts.m4 (gl_FUNC_FTS, gl_FUNC_FTS_LGPL): Invoke, don't require, + gl_FUNC_FTS_CORE. + (gl_FUNC_FTS_CORE): Invoke, don't require, gl_FUNC_OPENAT. + * m4/lstat.m4 (gl_FUNC_LSTAT): Invoke, don't require, + AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK. + * m4/memcmp.m4 (gl_FUNC_MEMCMP): Invoke, don't require, AC_FUNC_MEMCMP. + * m4/mktime.m4 (gl_FUNC_MKTIME): Invoke, don't require, AC_FUNC_MKTIME. + * m4/openat.m4 (gl_FUNC_OPENAT): Invoke, don't require, + gl_FUNC_FCHOWNAT. + * m4/strftime.m4 (gl_FUNC_GNU_STRFTIME): Invoke, don't require, + gl_FUNC_STRFTIME. + * m4/strtod.m4 (gl_FUNC_STRTOD): Invoke, don't require, AC_FUNC_STRTOD. + Reported by Ralf Wildenhues. + +2007-01-24 Bruno Haible + Drop AC_REQUIRE calls that are redundant with the module dependencies. * m4/canon-host.m4 (gl_PREREQ_CANON_HOST): Don't require gl_GETADDRINFO. diff --git a/m4/argp.m4 b/m4/argp.m4 index 5c4213955..77f1510c8 100644 --- a/m4/argp.m4 +++ b/m4/argp.m4 @@ -1,5 +1,5 @@ -# argp.m4 serial 7 -dnl Copyright (C) 2003-2006 Free Software Foundation, Inc. +# argp.m4 serial 8 +dnl Copyright (C) 2003-2007 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,10 @@ AC_DEFUN([gl_ARGP], AC_REQUIRE([AC_C_INLINE]) AC_REQUIRE([AC_C_RESTRICT]) AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) - AC_REQUIRE([gl_GETOPT_SUBSTITUTE]) + 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). AC_CHECK_DECL([program_invocation_name], [AC_DEFINE(HAVE_DECL_PROGRAM_INVOCATION_NAME, 1, diff --git a/m4/fts.m4 b/m4/fts.m4 index ae6c46996..cceb48fbe 100644 --- a/m4/fts.m4 +++ b/m4/fts.m4 @@ -1,4 +1,4 @@ -#serial 12 +#serial 13 dnl Copyright (C) 2005-2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,12 +6,12 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FUNC_FTS], [ - AC_REQUIRE([gl_FUNC_FTS_CORE]) + gl_FUNC_FTS_CORE ]) AC_DEFUN([gl_FUNC_FTS_LGPL], [ - AC_REQUIRE([gl_FUNC_FTS_CORE]) + gl_FUNC_FTS_CORE ]) AC_DEFUN([gl_FUNC_FTS_CORE], @@ -21,7 +21,7 @@ AC_DEFUN([gl_FUNC_FTS_CORE], AC_LIBOBJ([fts]) dnl Prerequisites of lib/fts.c. - AC_REQUIRE([gl_FUNC_OPENAT]) + gl_FUNC_OPENAT # Checks for header files. AC_CHECK_HEADERS_ONCE([sys/param.h])dnl diff --git a/m4/lstat.m4 b/m4/lstat.m4 index 2d4585771..b9777a6a8 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,6 +1,6 @@ -#serial 15 +#serial 16 -# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006 +# Copyright (C) 1997, 1998, 1999, 2000, 2001, 2003, 2004, 2005, 2006, 2007 # Free Software Foundation, Inc. # # This file is free software; the Free Software Foundation @@ -11,7 +11,7 @@ dnl From Jim Meyering. AC_DEFUN([gl_FUNC_LSTAT], [ - AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) + AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ(lstat). : ]) diff --git a/m4/memcmp.m4 b/m4/memcmp.m4 index 58faf0bd2..099b141b2 100644 --- a/m4/memcmp.m4 +++ b/m4/memcmp.m4 @@ -1,12 +1,13 @@ -# memcmp.m4 serial 11 -dnl Copyright (C) 2002, 2003, 2004 Free Software Foundation, Inc. +# memcmp.m4 serial 12 +dnl Copyright (C) 2002, 2003, 2004, 2007 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_MEMCMP], [ - AC_REQUIRE([AC_FUNC_MEMCMP]) + AC_FUNC_MEMCMP + dnl Note: AC_FUNC_MEMCMP does AC_LIBOBJ(memcmp). if test $ac_cv_func_memcmp_working = no; then AC_DEFINE(memcmp, rpl_memcmp, [Define to rpl_memcmp if the replacement function should be used.]) diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 44e30bac2..cec7bc3ff 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -#serial 11 +#serial 12 dnl Copyright (C) 2002, 2003, 2005, 2006, 2007 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -211,7 +211,8 @@ fi AC_DEFUN([gl_FUNC_MKTIME], [ - AC_REQUIRE([AC_FUNC_MKTIME]) + AC_FUNC_MKTIME + dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ(mktime). if test $ac_cv_func_working_mktime = no; then AC_DEFINE(mktime, rpl_mktime, [Define to rpl_mktime if the replacement function should be used.]) diff --git a/m4/openat.m4 b/m4/openat.m4 index 6d21bc485..313dc6f7f 100644 --- a/m4/openat.m4 +++ b/m4/openat.m4 @@ -1,4 +1,4 @@ -#serial 14 +#serial 15 # See if we need to use our replacement for Solaris' openat et al functions. dnl Copyright (C) 2004, 2005, 2006, 2007 Free Software Foundation, Inc. @@ -24,7 +24,7 @@ AC_DEFUN([gl_FUNC_OPENAT], [Define to rpl_ if the openat replacement function should be used.]) gl_PREREQ_OPENAT;; esac - AC_REQUIRE([gl_FUNC_FCHOWNAT]) + gl_FUNC_FCHOWNAT ]) # gl_FUNC_FCHOWNAT_DEREF_BUG([ACTION-IF-BUGGY[, ACTION-IF-NOT_BUGGY]]) diff --git a/m4/strftime.m4 b/m4/strftime.m4 index 81e7cc65e..70b537894 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,4 +1,4 @@ -#serial 28 +#serial 29 # Copyright (C) 1996, 1997, 1999, 2000, 2001, 2002, 2003, 2004, 2005, # 2006, 2007 Free Software Foundation, Inc. @@ -10,7 +10,8 @@ # Written by Jim Meyering and Paul Eggert. AC_DEFUN([gl_FUNC_GNU_STRFTIME], -[AC_REQUIRE([gl_FUNC_STRFTIME])dnl +[ + gl_FUNC_STRFTIME ]) # These are the prerequisite macros for GNU's strftime.c replacement. diff --git a/m4/strtod.m4 b/m4/strtod.m4 index 80a1d7dff..1de2f2fb9 100644 --- a/m4/strtod.m4 +++ b/m4/strtod.m4 @@ -1,12 +1,13 @@ -# strtod.m4 serial 5 -dnl Copyright (C) 2002, 2003, 2006 Free Software Foundation, Inc. +# strtod.m4 serial 6 +dnl Copyright (C) 2002, 2003, 2006, 2007 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_STRTOD], [ - AC_REQUIRE([AC_FUNC_STRTOD]) + AC_FUNC_STRTOD + dnl Note: AC_FUNC_STRTOD does AC_LIBOBJ(strtod). if test $ac_cv_func_strtod = no; then AC_DEFINE(strtod, rpl_strtod, [Define to rpl_strtod if the replacement function should be used.])