From 8aeb5be96aa28c4770299a54758a8fb339993a97 Mon Sep 17 00:00:00 2001 From: Paul Eggert Date: Wed, 15 Jun 2011 15:27:54 -0700 Subject: [PATCH] Merge from gnulib: lib/gnulib.mk, m4/*.m4. --- ChangeLog | 7 +++++- lib/gnulib.mk | 20 +++++++---------- m4/c-strtod.m4 | 10 +++------ m4/filemode.m4 | 3 +-- m4/getloadavg.m4 | 6 +++--- m4/getopt.m4 | 39 +++++++++++++++++---------------- m4/gl-comp.m4 | 47 +++++++++++++++++++++++++++++++++++++++- m4/lstat.m4 | 35 +++++++++++++++--------------- m4/md5.m4 | 4 +--- m4/mktime.m4 | 56 +++++++++++++++++++++--------------------------- m4/readlink.m4 | 6 +----- m4/sha1.m4 | 4 +--- m4/stat.m4 | 14 ++++++------ m4/strftime.m4 | 4 +--- m4/strtoull.m4 | 5 ++--- m4/strtoumax.m4 | 7 ++---- m4/symlink.m4 | 4 +--- m4/time_r.m4 | 4 ---- 18 files changed, 146 insertions(+), 129 deletions(-) diff --git a/ChangeLog b/ChangeLog index c6531ffba3..f9d1c97435 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,6 +1,11 @@ 2011-06-15 Paul Eggert - * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: Merge from gnulib. + * lib/ftoastr.c, lib/stdio.in.h, lib/verify.h: + * lib/gnulib.mk, m4/c-strtod.m4, m4/filemode.m4, m4/getloadavg.m4: + * m4/getopt.m4, m4/gl-comp.m4, m4/lstat.m4, m4/md5.m4, m4/mktime.m4: + * m4/readlink.m4, m4/sha1.m4, m4/stat.m4, m4/strftime.m4: + * m4/strtoull.m4, m4/strtoumax.m4, m4/symlink.m4, m4/time_r.m4: + Merge from gnulib. 2011-06-14 Jan Djärv diff --git a/lib/gnulib.mk b/lib/gnulib.mk index 5f24b81aea..284d273b26 100644 --- a/lib/gnulib.mk +++ b/lib/gnulib.mk @@ -87,19 +87,17 @@ EXTRA_DIST += careadlinkat.h ## begin gnulib module crypto/md5 +libgnu_a_SOURCES += md5.c -EXTRA_DIST += md5.c md5.h - -EXTRA_libgnu_a_SOURCES += md5.c +EXTRA_DIST += md5.h ## end gnulib module crypto/md5 ## begin gnulib module crypto/sha1 +libgnu_a_SOURCES += sha1.c -EXTRA_DIST += sha1.c sha1.h - -EXTRA_libgnu_a_SOURCES += sha1.c +EXTRA_DIST += sha1.h ## end gnulib module crypto/sha1 @@ -124,10 +122,9 @@ EXTRA_libgnu_a_SOURCES += ftoastr.c ## begin gnulib module filemode +libgnu_a_SOURCES += filemode.c -EXTRA_DIST += filemode.c filemode.h - -EXTRA_libgnu_a_SOURCES += filemode.c +EXTRA_DIST += filemode.h ## end gnulib module filemode @@ -616,10 +613,9 @@ EXTRA_DIST += stdlib.in.h ## begin gnulib module strftime +libgnu_a_SOURCES += strftime.c -EXTRA_DIST += strftime.c strftime.h - -EXTRA_libgnu_a_SOURCES += strftime.c +EXTRA_DIST += strftime.h ## end gnulib module strftime diff --git a/m4/c-strtod.m4 b/m4/c-strtod.m4 index d5f5f502cb..20c65b8258 100644 --- a/m4/c-strtod.m4 +++ b/m4/c-strtod.m4 @@ -1,4 +1,4 @@ -# c-strtod.m4 serial 12 +# c-strtod.m4 serial 14 # Copyright (C) 2004-2006, 2009-2011 Free Software Foundation, Inc. # This file is free software; the Free Software Foundation @@ -33,11 +33,9 @@ AC_DEFUN([gl_C99_STRTOLD], fi ]) +dnl Prerequisites of lib/c-strtod.c. AC_DEFUN([gl_C_STRTOD], [ - AC_LIBOBJ([c-strtod]) - - dnl Prerequisites of lib/c-strtod.c. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_CHECK_FUNCS([strtod_l]) @@ -45,11 +43,9 @@ AC_DEFUN([gl_C_STRTOD], : ]) +dnl Prerequisites of lib/c-strtold.c. AC_DEFUN([gl_C_STRTOLD], [ - AC_LIBOBJ([c-strtold]) - - dnl Prerequisites of lib/c-strtold.c. AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS]) AC_REQUIRE([gl_C99_STRTOLD]) AC_CHECK_FUNCS([strtold_l]) diff --git a/m4/filemode.m4 b/m4/filemode.m4 index 4147fd01e2..8f6e8bc3bb 100644 --- a/m4/filemode.m4 +++ b/m4/filemode.m4 @@ -1,4 +1,4 @@ -# filemode.m4 serial 7 +# filemode.m4 serial 8 dnl Copyright (C) 2002, 2005-2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -7,6 +7,5 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_FILEMODE], [ AC_REQUIRE([AC_STRUCT_ST_DM_MODE]) - AC_LIBOBJ([filemode]) AC_CHECK_DECLS_ONCE([strmode]) ]) diff --git a/m4/getloadavg.m4 b/m4/getloadavg.m4 index 0e44b694e4..967dfd797f 100644 --- a/m4/getloadavg.m4 +++ b/m4/getloadavg.m4 @@ -7,7 +7,7 @@ # gives unlimited permission to copy and/or distribute it, # with or without modifications, as long as this notice is preserved. -#serial 3 +#serial 4 # Autoconf defines AC_FUNC_GETLOADAVG, but that is obsolescent. # New applications should use gl_GETLOADAVG instead. @@ -24,6 +24,7 @@ gl_save_LIBS=$LIBS # getloadvg is present in libc on glibc >= 2.2, MacOS X, FreeBSD >= 2.0, # NetBSD >= 0.9, OpenBSD >= 2.0, Solaris >= 7. +HAVE_GETLOADAVG=1 AC_CHECK_FUNC([getloadavg], [], [gl_have_func=no @@ -52,8 +53,7 @@ AC_CHECK_FUNC([getloadavg], [], # Set up the replacement function if necessary. if test $gl_have_func = no; then - AC_LIBOBJ([getloadavg]) - gl_PREREQ_GETLOADAVG + HAVE_GETLOADAVG=0 fi]) if test "x$gl_save_LIBS" = x; then diff --git a/m4/getopt.m4 b/m4/getopt.m4 index 035a530df2..4d8450ff90 100644 --- a/m4/getopt.m4 +++ b/m4/getopt.m4 @@ -1,4 +1,4 @@ -# getopt.m4 serial 34 +# getopt.m4 serial 35 dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -9,10 +9,25 @@ AC_DEFUN([gl_FUNC_GETOPT_POSIX], [ m4_divert_text([DEFAULTS], [gl_getopt_required=POSIX]) AC_REQUIRE([gl_UNISTD_H_DEFAULTS]) - gl_GETOPT_IFELSE([ - gl_REPLACE_GETOPT - ], - []) + dnl Other modules can request the gnulib implementation of the getopt + dnl functions unconditionally, by defining gl_REPLACE_GETOPT_ALWAYS. + dnl argp.m4 does this. + m4_ifdef([gl_REPLACE_GETOPT_ALWAYS], [ + gl_GETOPT_IFELSE([], []) + REPLACE_GETOPT=1 + ], [ + REPLACE_GETOPT=0 + gl_GETOPT_IFELSE([ + REPLACE_GETOPT=1 + ], + []) + ]) + if test $REPLACE_GETOPT = 1; then + dnl Arrange for getopt.h to be created. + gl_GETOPT_SUBSTITUTE_HEADER + dnl Arrange for unistd.h to include getopt.h. + GNULIB_UNISTD_H_GETOPT=1 + fi ]) # Request a POSIX compliant getopt function with GNU extensions (such as @@ -25,20 +40,6 @@ AC_DEFUN([gl_FUNC_GETOPT_GNU], AC_REQUIRE([gl_FUNC_GETOPT_POSIX]) ]) -# Request the gnulib implementation of the getopt functions unconditionally. -# argp.m4 uses this. -AC_DEFUN([gl_REPLACE_GETOPT], -[ - dnl Arrange for getopt.h to be created. - gl_GETOPT_SUBSTITUTE_HEADER - dnl Arrange for unistd.h to include getopt.h. - GNULIB_UNISTD_H_GETOPT=1 - dnl Arrange to compile the getopt implementation. - AC_LIBOBJ([getopt]) - AC_LIBOBJ([getopt1]) - gl_PREREQ_GETOPT -]) - # emacs' configure.in uses this. AC_DEFUN([gl_GETOPT_IFELSE], [ diff --git a/m4/gl-comp.m4 b/m4/gl-comp.m4 index cb9f11a628..b170693ffe 100644 --- a/m4/gl-comp.m4 +++ b/m4/gl-comp.m4 @@ -97,18 +97,44 @@ gl_SHA1 AC_REQUIRE([gl_C99_STRTOLD]) gl_FILEMODE gl_GETLOADAVG +if test $HAVE_GETLOADAVG = 0; then + AC_LIBOBJ([getloadavg]) + gl_PREREQ_GETLOADAVG +fi gl_STDLIB_MODULE_INDICATOR([getloadavg]) gl_FUNC_GETOPT_GNU +if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT +fi gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu]) gl_FUNC_GETOPT_POSIX +if test $REPLACE_GETOPT = 1; then + AC_LIBOBJ([getopt]) + AC_LIBOBJ([getopt1]) + gl_PREREQ_GETOPT +fi AC_REQUIRE([AC_C_INLINE]) gl_INTTYPES_INCOMPLETE gl_FUNC_LSTAT +if test $REPLACE_LSTAT = 1; then + AC_LIBOBJ([lstat]) + gl_PREREQ_LSTAT +fi gl_SYS_STAT_MODULE_INDICATOR([lstat]) gl_FUNC_MKTIME +if test $REPLACE_MKTIME = 1; then + AC_LIBOBJ([mktime]) + gl_PREREQ_MKTIME +fi gl_TIME_MODULE_INDICATOR([mktime]) gl_MULTIARCH gl_FUNC_READLINK +if test $HAVE_READLINK = 0 || test $REPLACE_READLINK = 1; then + AC_LIBOBJ([readlink]) + gl_PREREQ_READLINK +fi gl_UNISTD_MODULE_INDICATOR([readlink]) gl_TYPE_SOCKLEN_T gt_TYPE_SSIZE_T @@ -120,13 +146,24 @@ gl_STDIO_H gl_STDLIB_H gl_FUNC_GNU_STRFTIME gl_FUNC_STRTOUMAX +if test "$ac_cv_have_decl_strtoumax" != yes && test $ac_cv_func_strtoumax = no; then + AC_LIBOBJ([strtoumax]) + gl_PREREQ_STRTOUMAX +fi gl_INTTYPES_MODULE_INDICATOR([strtoumax]) gl_FUNC_SYMLINK +if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then + AC_LIBOBJ([symlink]) +fi gl_UNISTD_MODULE_INDICATOR([symlink]) gl_HEADER_SYS_STAT_H AC_PROG_MKDIR_P gl_HEADER_TIME_H gl_TIME_R +if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then + AC_LIBOBJ([time_r]) + gl_PREREQ_TIME_R +fi gl_TIME_MODULE_INDICATOR([time_r]) gl_UNISTD_H gl_gnulib_enabled_dosname=false @@ -152,6 +189,10 @@ AC_SUBST([LTLIBINTL]) { if ! $gl_gnulib_enabled_stat; then gl_FUNC_STAT +if test $REPLACE_STAT = 1; then + AC_LIBOBJ([stat]) + gl_PREREQ_STAT +fi gl_SYS_STAT_MODULE_INDICATOR([stat]) gl_gnulib_enabled_stat=true if $condition; then @@ -163,6 +204,10 @@ gl_SYS_STAT_MODULE_INDICATOR([stat]) { if ! $gl_gnulib_enabled_strtoull; then gl_FUNC_STRTOULL +if test $HAVE_STRTOULL = 0; then + AC_LIBOBJ([strtoull]) + gl_PREREQ_STRTOULL +fi gl_STDLIB_MODULE_INDICATOR([strtoull]) gl_gnulib_enabled_strtoull=true fi @@ -173,7 +218,7 @@ gl_STDLIB_MODULE_INDICATOR([strtoull]) gl_gnulib_enabled_verify=true fi } - if test $GNULIB_UNISTD_H_GETOPT = 1; then + if test $REPLACE_GETOPT = 1; then func_gl_gnulib_m4code_be453cec5eecf5731a274f2de7f2db36 fi if test $REPLACE_LSTAT = 1; then diff --git a/m4/lstat.m4 b/m4/lstat.m4 index b9b22a6b20..72c76c6cf3 100644 --- a/m4/lstat.m4 +++ b/m4/lstat.m4 @@ -1,4 +1,4 @@ -# serial 21 +# serial 22 # Copyright (C) 1997-2001, 2003-2011 Free Software Foundation, Inc. # @@ -16,23 +16,27 @@ AC_DEFUN([gl_FUNC_LSTAT], AC_CHECK_FUNCS_ONCE([lstat]) if test $ac_cv_func_lstat = yes; then AC_REQUIRE([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK]) - if test $ac_cv_func_lstat_dereferences_slashed_symlink = no; then - dnl Note: AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK does AC_LIBOBJ([lstat]). + if test $gl_cv_func_lstat_dereferences_slashed_symlink = no; then REPLACE_LSTAT=1 fi - # Prerequisites of lib/lstat.c. - AC_REQUIRE([AC_C_INLINE]) else HAVE_LSTAT=0 fi ]) -# Redefine AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK, because it is no longer -# maintained in Autoconf. -AC_DEFUN([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], +# Prerequisites of lib/lstat.c. +AC_DEFUN([gl_PREREQ_LSTAT], [ + AC_REQUIRE([AC_C_INLINE]) + : +]) + +AC_DEFUN([gl_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], +[ + dnl We don't use AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK any more, because it + dnl is no longer maintained in Autoconf and because it invokes AC_LIBOBJ. AC_CACHE_CHECK([whether lstat correctly handles trailing slash], - [ac_cv_func_lstat_dereferences_slashed_symlink], + [gl_cv_func_lstat_dereferences_slashed_symlink], [rm -f conftest.sym conftest.file echo >conftest.file if test "$as_ln_s" = "ln -s" && ln -s conftest.file conftest.sym; then @@ -45,25 +49,22 @@ AC_DEFUN([AC_FUNC_LSTAT_FOLLOWS_SLASHED_SYMLINK], have to compile and use the lstat wrapper. */ return lstat ("conftest.sym/", &sbuf) == 0; ]])], - [ac_cv_func_lstat_dereferences_slashed_symlink=yes], - [ac_cv_func_lstat_dereferences_slashed_symlink=no], + [gl_cv_func_lstat_dereferences_slashed_symlink=yes], + [gl_cv_func_lstat_dereferences_slashed_symlink=no], [# When cross-compiling, be pessimistic so we will end up using the # replacement version of lstat that checks for trailing slashes and # calls lstat a second time when necessary. - ac_cv_func_lstat_dereferences_slashed_symlink=no + gl_cv_func_lstat_dereferences_slashed_symlink=no ]) else # If the 'ln -s' command failed, then we probably don't even # have an lstat function. - ac_cv_func_lstat_dereferences_slashed_symlink=no + gl_cv_func_lstat_dereferences_slashed_symlink=no fi rm -f conftest.sym conftest.file ]) - test $ac_cv_func_lstat_dereferences_slashed_symlink = yes && + test $gl_cv_func_lstat_dereferences_slashed_symlink = yes && AC_DEFINE_UNQUOTED([LSTAT_FOLLOWS_SLASHED_SYMLINK], [1], [Define to 1 if `lstat' dereferences a symlink specified with a trailing slash.]) - if test "x$ac_cv_func_lstat_dereferences_slashed_symlink" = xno; then - AC_LIBOBJ([lstat]) - fi ]) diff --git a/m4/md5.m4 b/m4/md5.m4 index ce7671d6ce..4b41a85b35 100644 --- a/m4/md5.m4 +++ b/m4/md5.m4 @@ -1,4 +1,4 @@ -# md5.m4 serial 11 +# md5.m4 serial 12 dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,8 +6,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_MD5], [ - AC_LIBOBJ([md5]) - dnl Prerequisites of lib/md5.c. AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([AC_C_INLINE]) diff --git a/m4/mktime.m4 b/m4/mktime.m4 index 01167a1ec0..8ed6d5d2a3 100644 --- a/m4/mktime.m4 +++ b/m4/mktime.m4 @@ -1,4 +1,4 @@ -# serial 20 +# serial 21 dnl Copyright (C) 2002-2003, 2005-2007, 2009-2011 Free Software Foundation, dnl Inc. dnl This file is free software; the Free Software Foundation @@ -7,21 +7,24 @@ dnl with or without modifications, as long as this notice is preserved. dnl From Jim Meyering. -# Redefine AC_FUNC_MKTIME, because it is no longer maintained in Autoconf. -# AC_FUNC_MKTIME -# -------------- -AC_DEFUN([AC_FUNC_MKTIME], -[AC_CHECK_HEADERS_ONCE([unistd.h]) -AC_CHECK_FUNCS_ONCE([alarm]) -AC_REQUIRE([gl_MULTIARCH]) -if test $APPLE_UNIVERSAL_BUILD = 1; then - # A universal build on Apple MacOS X platforms. - # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. - # But we need a configuration result that is valid in both modes. - ac_cv_func_working_mktime=no -fi -AC_CACHE_CHECK([for working mktime], [ac_cv_func_working_mktime], -[AC_RUN_IFELSE([AC_LANG_SOURCE( +AC_DEFUN([gl_FUNC_MKTIME], +[ + AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) + + dnl We don't use AC_FUNC_MKTIME any more, because it is no longer maintained + dnl in Autoconf and because it invokes AC_LIBOBJ. + AC_CHECK_HEADERS_ONCE([unistd.h]) + AC_CHECK_FUNCS_ONCE([alarm]) + AC_REQUIRE([gl_MULTIARCH]) + if test $APPLE_UNIVERSAL_BUILD = 1; then + # A universal build on Apple MacOS X platforms. + # The test result would be 'yes' in 32-bit mode and 'no' in 64-bit mode. + # But we need a configuration result that is valid in both modes. + gl_cv_func_working_mktime=no + fi + AC_CACHE_CHECK([for working mktime], [gl_cv_func_working_mktime], + [AC_RUN_IFELSE( + [AC_LANG_SOURCE( [[/* Test program from Paul Eggert and Tony Leneis. */ #include #include @@ -213,22 +216,13 @@ main () result |= 64; return result; }]])], - [ac_cv_func_working_mktime=yes], - [ac_cv_func_working_mktime=no], - [ac_cv_func_working_mktime=no])]) -if test $ac_cv_func_working_mktime = no; then - AC_LIBOBJ([mktime]) -fi -])# AC_FUNC_MKTIME + [gl_cv_func_working_mktime=yes], + [gl_cv_func_working_mktime=no], + [gl_cv_func_working_mktime=no]) + ]) -AC_DEFUN([gl_FUNC_MKTIME], -[ - AC_REQUIRE([gl_HEADER_TIME_H_DEFAULTS]) - AC_FUNC_MKTIME - dnl Note: AC_FUNC_MKTIME does AC_LIBOBJ([mktime]). - if test $ac_cv_func_working_mktime = no; then + if test $gl_cv_func_working_mktime = no; then REPLACE_MKTIME=1 - gl_PREREQ_MKTIME else REPLACE_MKTIME=0 fi @@ -245,8 +239,6 @@ AC_DEFUN([gl_FUNC_MKTIME_INTERNAL], [ [dnl mktime works but it doesn't export __mktime_internal, dnl so we need to substitute our own mktime implementation. REPLACE_MKTIME=1 - AC_LIBOBJ([mktime]) - gl_PREREQ_MKTIME ]) fi ]) diff --git a/m4/readlink.m4 b/m4/readlink.m4 index ec737d3f40..91d7df3c91 100644 --- a/m4/readlink.m4 +++ b/m4/readlink.m4 @@ -1,4 +1,4 @@ -# readlink.m4 serial 10 +# readlink.m4 serial 11 dnl Copyright (C) 2003, 2007, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -10,8 +10,6 @@ AC_DEFUN([gl_FUNC_READLINK], AC_CHECK_FUNCS_ONCE([readlink]) if test $ac_cv_func_readlink = no; then HAVE_READLINK=0 - AC_LIBOBJ([readlink]) - gl_PREREQ_READLINK else AC_CACHE_CHECK([whether readlink signature is correct], [gl_cv_decl_readlink_works], @@ -40,10 +38,8 @@ AC_DEFUN([gl_FUNC_READLINK], AC_DEFINE([READLINK_TRAILING_SLASH_BUG], [1], [Define to 1 if readlink fails to recognize a trailing slash.]) REPLACE_READLINK=1 - AC_LIBOBJ([readlink]) elif test "$gl_cv_decl_readlink_works" != yes; then REPLACE_READLINK=1 - AC_LIBOBJ([readlink]) fi fi ]) diff --git a/m4/sha1.m4 b/m4/sha1.m4 index e40505f2f7..b8f5c1dcaf 100644 --- a/m4/sha1.m4 +++ b/m4/sha1.m4 @@ -1,4 +1,4 @@ -# sha1.m4 serial 9 +# sha1.m4 serial 10 dnl Copyright (C) 2002-2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -6,8 +6,6 @@ dnl with or without modifications, as long as this notice is preserved. AC_DEFUN([gl_SHA1], [ - AC_LIBOBJ([sha1]) - dnl Prerequisites of lib/sha1.c. AC_REQUIRE([gl_BIGENDIAN]) AC_REQUIRE([AC_C_INLINE]) diff --git a/m4/stat.m4 b/m4/stat.m4 index 27f82d5a91..c63f59fd53 100644 --- a/m4/stat.m4 +++ b/m4/stat.m4 @@ -1,4 +1,4 @@ -# serial 7 +# serial 8 # Copyright (C) 2009-2011 Free Software Foundation, Inc. # @@ -58,9 +58,11 @@ AC_DEFUN([gl_FUNC_STAT], AC_DEFINE([REPLACE_FUNC_STAT_FILE], [1], [Define to 1 if stat needs help when passed a file name with a trailing slash]);; esac - if test $REPLACE_STAT = 1; then - AC_LIBOBJ([stat]) - dnl Prerequisites of lib/stat.c. - AC_REQUIRE([AC_C_INLINE]) - fi +]) + +# Prerequisites of lib/stat.c. +AC_DEFUN([gl_PREREQ_STAT], +[ + AC_REQUIRE([AC_C_INLINE]) + : ]) diff --git a/m4/strftime.m4 b/m4/strftime.m4 index d9de341bf6..dd30ccfc05 100644 --- a/m4/strftime.m4 +++ b/m4/strftime.m4 @@ -1,4 +1,4 @@ -# serial 32 +# serial 33 # Copyright (C) 1996-1997, 1999-2007, 2009-2011 Free Software Foundation, Inc. # @@ -16,8 +16,6 @@ AC_DEFUN([gl_FUNC_GNU_STRFTIME], # These are the prerequisite macros for GNU's strftime.c replacement. AC_DEFUN([gl_FUNC_STRFTIME], [ - AC_LIBOBJ([strftime]) - # This defines (or not) HAVE_TZNAME and HAVE_TM_ZONE. AC_REQUIRE([AC_STRUCT_TIMEZONE]) diff --git a/m4/strtoull.m4 b/m4/strtoull.m4 index abf607fd7b..57ef75423d 100644 --- a/m4/strtoull.m4 +++ b/m4/strtoull.m4 @@ -1,4 +1,4 @@ -# strtoull.m4 serial 6 +# strtoull.m4 serial 7 dnl Copyright (C) 2002, 2004, 2006, 2008-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -11,10 +11,9 @@ 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_CHECK_FUNCS([strtoull]) if test $ac_cv_func_strtoull = no; then HAVE_STRTOULL=0 - gl_PREREQ_STRTOULL fi fi ]) diff --git a/m4/strtoumax.m4 b/m4/strtoumax.m4 index 7fa563642a..58b310de85 100644 --- a/m4/strtoumax.m4 +++ b/m4/strtoumax.m4 @@ -1,4 +1,4 @@ -# strtoumax.m4 serial 9 +# strtoumax.m4 serial 10 dnl Copyright (C) 2002-2004, 2006, 2009-2011 Free Software Foundation, Inc. dnl This file is free software; the Free Software Foundation dnl gives unlimited permission to copy and/or distribute it, @@ -12,10 +12,7 @@ AC_DEFUN([gl_FUNC_STRTOUMAX], if test "$ac_cv_have_decl_strtoumax" != yes; then HAVE_DECL_STRTOUMAX=0 - AC_REPLACE_FUNCS([strtoumax]) - if test $ac_cv_func_strtoumax = no; then - gl_PREREQ_STRTOUMAX - fi + AC_CHECK_FUNCS([strtoumax]) fi ]) diff --git a/m4/symlink.m4 b/m4/symlink.m4 index 917d5f0ec2..680c14f661 100644 --- a/m4/symlink.m4 +++ b/m4/symlink.m4 @@ -1,4 +1,4 @@ -# serial 4 +# serial 5 # See if we need to provide symlink replacement. dnl Copyright (C) 2009-2011 Free Software Foundation, Inc. @@ -17,7 +17,6 @@ AC_DEFUN([gl_FUNC_SYMLINK], dnl and Solaris 9, we want to fix a bug with trailing slash handling. if test $ac_cv_func_symlink = no; then HAVE_SYMLINK=0 - AC_LIBOBJ([symlink]) else AC_CACHE_CHECK([whether symlink handles trailing slash correctly], [gl_cv_func_symlink_works], @@ -39,7 +38,6 @@ AC_DEFUN([gl_FUNC_SYMLINK], rm -f conftest.f conftest.link conftest.lnk2]) if test "$gl_cv_func_symlink_works" != yes; then REPLACE_SYMLINK=1 - AC_LIBOBJ([symlink]) fi fi ]) diff --git a/m4/time_r.m4 b/m4/time_r.m4 index 9bb28005fc..d646edc2d3 100644 --- a/m4/time_r.m4 +++ b/m4/time_r.m4 @@ -50,10 +50,6 @@ AC_DEFUN([gl_TIME_R], else HAVE_LOCALTIME_R=0 fi - if test $HAVE_LOCALTIME_R = 0 || test $REPLACE_LOCALTIME_R = 1; then - AC_LIBOBJ([time_r]) - gl_PREREQ_TIME_R - fi ]) # Prerequisites of lib/time_r.c. -- 2.20.1