X-Git-Url: https://git.gag.com/?a=blobdiff_plain;f=m4%2Fgnulib-comp.m4;h=6d8237418352f577a470fad1d123cb63463be86e;hb=4aa85f09e755fc827cd5ab6225f20c83cd42245d;hp=837538e414bf376496584a4447a24c6ac266bd20;hpb=1a44d77d50f4fb37c0410eed04b82303624ea2ec;p=debian%2Ftar

diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 837538e4..6d823741 100644
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -1,12 +1,24 @@
 # -*- buffer-read-only: t -*- vi: set ro:
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2014 Free Software Foundation, Inc.
 #
-# This file is free software, distributed under the terms of the GNU
-# General Public License.  As a special exception to the GNU General
-# Public License, this file may be distributed as part of a program
-# that contains a configuration script generated by Autoconf, under
+# This file is free software; you can redistribute it and/or modify
+# it under the terms of the GNU General Public License as published by
+# the Free Software Foundation; either version 3 of the License, or
+# (at your option) any later version.
+#
+# This file is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU General Public License for more details.
+#
+# You should have received a copy of the GNU General Public License
+# along with this file.  If not, see <http://www.gnu.org/licenses/>.
+#
+# As a special exception to the GNU General Public License,
+# this file may be distributed as part of a program that
+# contains a configuration script generated by Autoconf, under
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
@@ -27,29 +39,35 @@ AC_DEFUN([gl_EARLY],
   m4_pattern_allow([^gl_ES$])dnl a valid locale name
   m4_pattern_allow([^gl_LIBOBJS$])dnl a variable
   m4_pattern_allow([^gl_LTLIBOBJS$])dnl a variable
-  AC_REQUIRE([AC_PROG_RANLIB])
+  AC_REQUIRE([gl_PROG_AR_RANLIB])
   AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module absolute-header:
+  # Code from module acl:
   # Code from module alloca:
   # Code from module alloca-opt:
+  # Code from module allocator:
   # Code from module areadlink:
   # Code from module areadlinkat:
-  # Code from module arg-nonnull:
   # Code from module argmatch:
   # Code from module argp:
   # Code from module argp-version-etc:
+  # Code from module at-internal:
   # Code from module backupfile:
   # Code from module bitrotate:
   # Code from module btowc:
-  # Code from module c++defs:
   # Code from module c-ctype:
+  # Code from module c-strcase:
+  # Code from module c-strcaseeq:
   # Code from module canonicalize-lgpl:
+  # Code from module careadlinkat:
+  # Code from module chdir:
   # Code from module chdir-long:
   # Code from module chown:
   # Code from module clock-time:
   # Code from module cloexec:
   # Code from module close:
-  # Code from module close-hook:
   # Code from module close-stream:
+  # Code from module closedir:
   # Code from module closeout:
   # Code from module configmake:
   # Code from module d-ino:
@@ -60,33 +78,46 @@ AC_DEFUN([gl_EARLY],
   # Code from module dirname-lgpl:
   # Code from module dosname:
   # Code from module double-slash-root:
+  # Code from module dup:
   # Code from module dup2:
   # Code from module environ:
   # Code from module errno:
   # Code from module error:
+  # Code from module euidaccess:
   # Code from module exclude:
   # Code from module exitfail:
   # Code from module extensions:
   AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module extern-inline:
+  # Code from module faccessat:
   # Code from module fchdir:
-  # Code from module fclose:
+  # Code from module fchmodat:
+  # Code from module fchownat:
   # Code from module fcntl:
   # Code from module fcntl-h:
+  # Code from module fd-hook:
   # Code from module fdopendir:
   # Code from module fdutimensat:
   # Code from module fileblocks:
+  # Code from module filename:
   # Code from module filenamecat-lgpl:
   # Code from module float:
   # Code from module fnmatch:
   # Code from module fnmatch-gnu:
   # Code from module fpending:
+  # Code from module fprintftime:
+  # Code from module fseek:
   # Code from module fseeko:
   AC_REQUIRE([AC_FUNC_FSEEKO])
+  # Code from module fstat:
+  # Code from module fstatat:
   # Code from module full-write:
   # Code from module futimens:
   # Code from module getcwd:
+  # Code from module getcwd-lgpl:
   # Code from module getdelim:
   # Code from module getdtablesize:
+  # Code from module getgroups:
   # Code from module getline:
   # Code from module getopt-gnu:
   # Code from module getopt-posix:
@@ -96,26 +127,33 @@ AC_DEFUN([gl_EARLY],
   # Code from module gettime:
   # Code from module gettimeofday:
   # Code from module gitlog-to-changelog:
+  # Code from module group-member:
   # Code from module hash:
   # Code from module havelib:
   # Code from module human:
   # Code from module include_next:
-  # Code from module inline:
   # Code from module intprops:
   # Code from module inttostr:
   # Code from module inttypes:
+  # Code from module inttypes-incomplete:
+  # Code from module isatty:
   # Code from module iswblank:
   # Code from module langinfo:
+  # Code from module largefile:
+  AC_REQUIRE([AC_SYS_LARGEFILE])
   # Code from module lchown:
   # Code from module link:
   # Code from module link-follow:
   # Code from module linkat:
   # Code from module localcharset:
+  # Code from module locale:
+  # Code from module localeconv:
   # Code from module lseek:
   # Code from module lstat:
   # Code from module malloc-gnu:
   # Code from module malloc-posix:
   # Code from module malloca:
+  # Code from module manywarnings:
   # Code from module mbchar:
   # Code from module mbrtowc:
   # Code from module mbscasecmp:
@@ -127,53 +165,79 @@ AC_DEFUN([gl_EARLY],
   # Code from module mempcpy:
   # Code from module memrchr:
   # Code from module mkdir:
+  # Code from module mkdirat:
   # Code from module mkdtemp:
   # Code from module mkfifo:
   # Code from module mkfifoat:
   # Code from module mknod:
   # Code from module mktime:
   # Code from module modechange:
+  # Code from module msvc-inval:
+  # Code from module msvc-nothrow:
   # Code from module multiarch:
   # Code from module nl_langinfo:
+  # Code from module nocrash:
   # Code from module obstack:
   # Code from module open:
   # Code from module openat:
   # Code from module openat-die:
+  # Code from module openat-h:
+  # Code from module opendir:
   # Code from module parse-datetime:
   # Code from module pathmax:
+  # Code from module posix_openpt:
   # Code from module priv-set:
   # Code from module progname:
+  # Code from module ptsname:
+  # Code from module ptsname_r:
+  # Code from module qacl:
   # Code from module quote:
   # Code from module quotearg:
   # Code from module quotearg-simple:
+  # Code from module raise:
   # Code from module rawmemchr:
+  # Code from module read:
+  # Code from module readdir:
   # Code from module readlink:
   # Code from module readlinkat:
   # Code from module realloc-posix:
   # Code from module regex:
   # Code from module rename:
   # Code from module renameat:
+  # Code from module rewinddir:
   # Code from module rmdir:
+  # Code from module root-uid:
   # Code from module rpmatch:
   # Code from module safe-read:
   # Code from module safe-write:
   # Code from module same-inode:
   # Code from module save-cwd:
   # Code from module savedir:
+  # Code from module secure_getenv:
+  # Code from module selinux-at:
+  # Code from module selinux-h:
   # Code from module setenv:
+  # Code from module signal-h:
   # Code from module size_max:
   # Code from module sleep:
+  # Code from module snippet/_Noreturn:
+  # Code from module snippet/arg-nonnull:
+  # Code from module snippet/c++defs:
+  # Code from module snippet/unused-parameter:
+  # Code from module snippet/warn-on-use:
   # Code from module snprintf:
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stat-macros:
   # Code from module stat-time:
+  # Code from module statat:
+  # Code from module stdalign:
   # Code from module stdarg:
   dnl Some compilers (e.g., AIX 5.3 cc) need to be in c99 mode
   dnl for the builtin va_copy to work.  With Autoconf 2.60 or later,
-  dnl AC_PROG_CC_STDC arranges for this.  With older Autoconf AC_PROG_CC_STDC
+  dnl gl_PROG_CC_C99 arranges for this.  With older Autoconf gl_PROG_CC_C99
   dnl shouldn't hurt, though installers are on their own to set c99 mode.
-  AC_REQUIRE([AC_PROG_CC_STDC])
+  gl_PROG_CC_C99
   # Code from module stdbool:
   # Code from module stddef:
   # Code from module stdint:
@@ -185,6 +249,8 @@ AC_DEFUN([gl_EARLY],
   # Code from module strdup-posix:
   # Code from module streq:
   # Code from module strerror:
+  # Code from module strerror-override:
+  # Code from module strftime:
   # Code from module string:
   # Code from module strings:
   # Code from module strndup:
@@ -200,19 +266,23 @@ AC_DEFUN([gl_EARLY],
   # Code from module symlinkat:
   # Code from module sys_stat:
   # Code from module sys_time:
+  # Code from module sys_types:
   # Code from module sysexits:
   # Code from module tempname:
   # Code from module time:
   # Code from module time_r:
   # Code from module timespec:
+  # Code from module ttyname_r:
   # Code from module unistd:
   # Code from module unistd-safer:
   # Code from module unitypes:
   # Code from module uniwidth/base:
   # Code from module uniwidth/width:
   # Code from module unlink:
+  # Code from module unlinkat:
   # Code from module unlinkdir:
   # Code from module unlocked-io:
+  # Code from module unlockpt:
   # Code from module unsetenv:
   # Code from module utimens:
   # Code from module utimensat:
@@ -222,7 +292,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module version-etc:
   # Code from module version-etc-fsf:
   # Code from module vsnprintf:
-  # Code from module warn-on-use:
+  # Code from module warnings:
   # Code from module wchar:
   # Code from module wcrtomb:
   # Code from module wctype-h:
@@ -230,6 +300,7 @@ AC_DEFUN([gl_EARLY],
   # Code from module write:
   # Code from module xalloc:
   # Code from module xalloc-die:
+  # Code from module xalloc-oversized:
   # Code from module xgetcwd:
   # Code from module xsize:
   # Code from module xstrndup:
@@ -254,482 +325,793 @@ AC_DEFUN([gl_INIT],
   m4_pushdef([gl_LIBSOURCES_DIR], [])
   gl_COMMON
   gl_source_base='gnu'
-  # Code from module alloca:
-  # Code from module alloca-opt:
   gl_FUNC_ALLOCA
-  # Code from module areadlink:
-  # Code from module areadlinkat:
   gl_MODULE_INDICATOR([areadlinkat])
-  # Code from module arg-nonnull:
-  # Code from module argmatch:
-  gl_ARGMATCH
-  # Code from module argp:
   gl_ARGP
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=argp_error:2:c-format])
      AM_][XGETTEXT_OPTION([--flag=argp_failure:4:c-format])])
-  # Code from module argp-version-etc:
-  # Code from module backupfile:
+  AC_LIBOBJ([openat-proc])
   gl_BACKUPFILE
-  # Code from module bitrotate:
-  AC_REQUIRE([AC_C_INLINE])
-  # Code from module btowc:
   gl_FUNC_BTOWC
+  if test $HAVE_BTOWC = 0 || test $REPLACE_BTOWC = 1; then
+    AC_LIBOBJ([btowc])
+    gl_PREREQ_BTOWC
+  fi
   gl_WCHAR_MODULE_INDICATOR([btowc])
-  # Code from module c++defs:
-  # Code from module c-ctype:
-  # Code from module canonicalize-lgpl:
   gl_CANONICALIZE_LGPL
+  if test $HAVE_CANONICALIZE_FILE_NAME = 0 || test $REPLACE_CANONICALIZE_FILE_NAME = 1; then
+    AC_LIBOBJ([canonicalize-lgpl])
+  fi
   gl_MODULE_INDICATOR([canonicalize-lgpl])
   gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
   gl_STDLIB_MODULE_INDICATOR([realpath])
-  # Code from module chdir-long:
+  AC_CHECK_FUNCS_ONCE([readlinkat])
+  gl_UNISTD_MODULE_INDICATOR([chdir])
   gl_FUNC_CHDIR_LONG
-  # Code from module chown:
+  if test $gl_cv_have_arbitrary_file_name_length_limit = yes; then
+    AC_LIBOBJ([chdir-long])
+    gl_PREREQ_CHDIR_LONG
+  fi
   gl_FUNC_CHOWN
+  if test $HAVE_CHOWN = 0 || test $REPLACE_CHOWN = 1; then
+    AC_LIBOBJ([chown])
+  fi
+  if test $REPLACE_CHOWN = 1 && test $ac_cv_func_fchown = no; then
+    AC_LIBOBJ([fchown-stub])
+  fi
   gl_UNISTD_MODULE_INDICATOR([chown])
-  # Code from module clock-time:
   gl_CLOCK_TIME
-  # Code from module cloexec:
-  gl_CLOEXEC
   gl_MODULE_INDICATOR_FOR_TESTS([cloexec])
-  # Code from module close:
   gl_FUNC_CLOSE
+  if test $REPLACE_CLOSE = 1; then
+    AC_LIBOBJ([close])
+  fi
   gl_UNISTD_MODULE_INDICATOR([close])
-  # Code from module close-hook:
-  # Code from module close-stream:
   gl_CLOSE_STREAM
   gl_MODULE_INDICATOR([close-stream])
-  # Code from module closeout:
+  gl_FUNC_CLOSEDIR
+  if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
+    AC_LIBOBJ([closedir])
+  fi
+  gl_DIRENT_MODULE_INDICATOR([closedir])
   gl_CLOSEOUT
-  # Code from module configmake:
   gl_CONFIGMAKE_PREP
-  # Code from module d-ino:
   gl_CHECK_TYPE_STRUCT_DIRENT_D_INO
-  # Code from module dirent:
   gl_DIRENT_H
-  # Code from module dirent-safer:
   gl_DIRENT_SAFER
   gl_MODULE_INDICATOR([dirent-safer])
-  # Code from module dirfd:
   gl_FUNC_DIRFD
+  if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no; then
+    AC_LIBOBJ([dirfd])
+    gl_PREREQ_DIRFD
+  fi
   gl_DIRENT_MODULE_INDICATOR([dirfd])
-  # Code from module dirname:
   gl_DIRNAME
   gl_MODULE_INDICATOR([dirname])
-  # Code from module dirname-lgpl:
   gl_DIRNAME_LGPL
-  # Code from module dosname:
-  # Code from module double-slash-root:
   gl_DOUBLE_SLASH_ROOT
-  # Code from module dup2:
+  gl_FUNC_DUP
+  if test $REPLACE_DUP = 1; then
+    AC_LIBOBJ([dup])
+    gl_PREREQ_DUP
+  fi
+  gl_UNISTD_MODULE_INDICATOR([dup])
   gl_FUNC_DUP2
+  if test $HAVE_DUP2 = 0 || test $REPLACE_DUP2 = 1; then
+    AC_LIBOBJ([dup2])
+    gl_PREREQ_DUP2
+  fi
   gl_UNISTD_MODULE_INDICATOR([dup2])
-  # Code from module environ:
   gl_ENVIRON
   gl_UNISTD_MODULE_INDICATOR([environ])
-  # Code from module errno:
   gl_HEADER_ERRNO_H
-  # Code from module error:
   gl_ERROR
+  if test $ac_cv_lib_error_at_line = no; then
+    AC_LIBOBJ([error])
+    gl_PREREQ_ERROR
+  fi
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=error:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=error_at_line:5:c-format])])
-  # Code from module exclude:
-  gl_EXCLUDE
-  # Code from module exitfail:
-  # Code from module extensions:
-  # Code from module fchdir:
+  gl_FUNC_EUIDACCESS
+  if test $HAVE_EUIDACCESS = 0; then
+    AC_LIBOBJ([euidaccess])
+    gl_PREREQ_EUIDACCESS
+  fi
+  gl_UNISTD_MODULE_INDICATOR([euidaccess])
+  AC_REQUIRE([gl_EXTERN_INLINE])
+  gl_FUNC_FACCESSAT
+  if test $HAVE_FACCESSAT = 0; then
+    AC_LIBOBJ([faccessat])
+    gl_PREREQ_FACCESSAT
+  fi
+  gl_MODULE_INDICATOR([faccessat])
+  gl_UNISTD_MODULE_INDICATOR([faccessat])
   gl_FUNC_FCHDIR
   gl_UNISTD_MODULE_INDICATOR([fchdir])
-  # Code from module fclose:
-  gl_FUNC_FCLOSE
-  gl_STDIO_MODULE_INDICATOR([fclose])
-  # Code from module fcntl:
+  gl_FUNC_FCHMODAT
+  if test $HAVE_FCHMODAT = 0; then
+    AC_LIBOBJ([fchmodat])
+  fi
+  gl_MODULE_INDICATOR([fchmodat]) dnl for lib/openat.h
+  gl_SYS_STAT_MODULE_INDICATOR([fchmodat])
+  gl_FUNC_FCHOWNAT
+  if test $HAVE_FCHOWNAT = 0 || test $REPLACE_FCHOWNAT = 1; then
+    AC_LIBOBJ([fchownat])
+  fi
+  gl_MODULE_INDICATOR([fchownat]) dnl for lib/openat.h
+  gl_UNISTD_MODULE_INDICATOR([fchownat])
   gl_FUNC_FCNTL
+  if test $HAVE_FCNTL = 0 || test $REPLACE_FCNTL = 1; then
+    AC_LIBOBJ([fcntl])
+  fi
   gl_FCNTL_MODULE_INDICATOR([fcntl])
-  # Code from module fcntl-h:
   gl_FCNTL_H
-  # Code from module fdopendir:
   gl_FUNC_FDOPENDIR
+  if test $HAVE_FDOPENDIR = 0 || test $REPLACE_FDOPENDIR = 1; then
+    AC_LIBOBJ([fdopendir])
+  fi
   gl_DIRENT_MODULE_INDICATOR([fdopendir])
   gl_MODULE_INDICATOR([fdopendir])
-  # Code from module fdutimensat:
-  AC_REQUIRE([AC_C_INLINE]) dnl because 'inline' is used in lib/utimens.h
   gl_MODULE_INDICATOR([fdutimensat])
-  # Code from module fileblocks:
   gl_FILEBLOCKS
-  # Code from module filenamecat-lgpl:
+  if test $ac_cv_member_struct_stat_st_blocks = no; then
+    AC_LIBOBJ([fileblocks])
+    gl_PREREQ_FILEBLOCKS
+  fi
   gl_FILE_NAME_CONCAT_LGPL
-  # Code from module float:
   gl_FLOAT_H
-  # Code from module fnmatch:
+  if test $REPLACE_FLOAT_LDBL = 1; then
+    AC_LIBOBJ([float])
+  fi
+  if test $REPLACE_ITOLD = 1; then
+    AC_LIBOBJ([itold])
+  fi
   gl_FUNC_FNMATCH_POSIX
-  # Code from module fnmatch-gnu:
+  if test -n "$FNMATCH_H"; then
+    AC_LIBOBJ([fnmatch])
+    gl_PREREQ_FNMATCH
+  fi
   gl_FUNC_FNMATCH_GNU
-  # Code from module fpending:
+  if test -n "$FNMATCH_H"; then
+    AC_LIBOBJ([fnmatch])
+    gl_PREREQ_FNMATCH
+  fi
   gl_FUNC_FPENDING
-  # Code from module fseeko:
+  if test $gl_cv_func___fpending = no; then
+    AC_LIBOBJ([fpending])
+    gl_PREREQ_FPENDING
+  fi
+  gl_FUNC_FSEEK
+  if test $REPLACE_FSEEK = 1; then
+    AC_LIBOBJ([fseek])
+  fi
+  gl_STDIO_MODULE_INDICATOR([fseek])
   gl_FUNC_FSEEKO
+  if test $HAVE_FSEEKO = 0 || test $REPLACE_FSEEKO = 1; then
+    AC_LIBOBJ([fseeko])
+    gl_PREREQ_FSEEKO
+  fi
   gl_STDIO_MODULE_INDICATOR([fseeko])
-  # Code from module full-write:
-  # Code from module futimens:
+  gl_FUNC_FSTAT
+  if test $REPLACE_FSTAT = 1; then
+    AC_LIBOBJ([fstat])
+    gl_PREREQ_FSTAT
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([fstat])
+  gl_FUNC_FSTATAT
+  if test $HAVE_FSTATAT = 0 || test $REPLACE_FSTATAT = 1; then
+    AC_LIBOBJ([fstatat])
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([fstatat])
   gl_FUNC_FUTIMENS
+  if test $HAVE_FUTIMENS = 0 || test $REPLACE_FUTIMENS = 1; then
+    AC_LIBOBJ([futimens])
+  fi
   gl_SYS_STAT_MODULE_INDICATOR([futimens])
-  # Code from module getcwd:
   gl_FUNC_GETCWD
+  if test $REPLACE_GETCWD = 1; then
+    AC_LIBOBJ([getcwd])
+    gl_PREREQ_GETCWD
+  fi
+  gl_MODULE_INDICATOR([getcwd])
+  gl_UNISTD_MODULE_INDICATOR([getcwd])
+  gl_FUNC_GETCWD_LGPL
+  if test $REPLACE_GETCWD = 1; then
+    AC_LIBOBJ([getcwd-lgpl])
+  fi
   gl_UNISTD_MODULE_INDICATOR([getcwd])
-  # Code from module getdelim:
   gl_FUNC_GETDELIM
+  if test $HAVE_GETDELIM = 0 || test $REPLACE_GETDELIM = 1; then
+    AC_LIBOBJ([getdelim])
+    gl_PREREQ_GETDELIM
+  fi
   gl_STDIO_MODULE_INDICATOR([getdelim])
-  # Code from module getdtablesize:
   gl_FUNC_GETDTABLESIZE
+  if test $HAVE_GETDTABLESIZE = 0 || test $REPLACE_GETDTABLESIZE = 1; then
+    AC_LIBOBJ([getdtablesize])
+    gl_PREREQ_GETDTABLESIZE
+  fi
   gl_UNISTD_MODULE_INDICATOR([getdtablesize])
-  # Code from module getline:
+  gl_FUNC_GETGROUPS
+  if test $HAVE_GETGROUPS = 0 || test $REPLACE_GETGROUPS = 1; then
+    AC_LIBOBJ([getgroups])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([getgroups])
   gl_FUNC_GETLINE
+  if test $REPLACE_GETLINE = 1; then
+    AC_LIBOBJ([getline])
+    gl_PREREQ_GETLINE
+  fi
   gl_STDIO_MODULE_INDICATOR([getline])
-  # Code from module getopt-gnu:
   gl_FUNC_GETOPT_GNU
+  if test $REPLACE_GETOPT = 1; then
+    AC_LIBOBJ([getopt])
+    AC_LIBOBJ([getopt1])
+    gl_PREREQ_GETOPT
+    dnl Arrange for unistd.h to include getopt.h.
+    GNULIB_GL_UNISTD_H_GETOPT=1
+  fi
+  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
   gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
-  # Code from module getopt-posix:
   gl_FUNC_GETOPT_POSIX
-  # Code from module getpagesize:
+  if test $REPLACE_GETOPT = 1; then
+    AC_LIBOBJ([getopt])
+    AC_LIBOBJ([getopt1])
+    gl_PREREQ_GETOPT
+    dnl Arrange for unistd.h to include getopt.h.
+    GNULIB_GL_UNISTD_H_GETOPT=1
+  fi
+  AC_SUBST([GNULIB_GL_UNISTD_H_GETOPT])
   gl_FUNC_GETPAGESIZE
+  if test $REPLACE_GETPAGESIZE = 1; then
+    AC_LIBOBJ([getpagesize])
+  fi
   gl_UNISTD_MODULE_INDICATOR([getpagesize])
-  # Code from module gettext:
   dnl you must add AM_GNU_GETTEXT([external]) or similar to configure.ac.
   AM_GNU_GETTEXT_VERSION([0.18.1])
-  # Code from module gettext-h:
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
-  # Code from module gettime:
   gl_GETTIME
-  # Code from module gettimeofday:
   gl_FUNC_GETTIMEOFDAY
+  if test $HAVE_GETTIMEOFDAY = 0 || test $REPLACE_GETTIMEOFDAY = 1; then
+    AC_LIBOBJ([gettimeofday])
+    gl_PREREQ_GETTIMEOFDAY
+  fi
   gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
-  # Code from module gitlog-to-changelog:
-  # Code from module hash:
-  gl_HASH
-  # Code from module havelib:
-  # Code from module human:
+  gl_FUNC_GROUP_MEMBER
+  if test $HAVE_GROUP_MEMBER = 0; then
+    AC_LIBOBJ([group-member])
+    gl_PREREQ_GROUP_MEMBER
+  fi
+  gl_UNISTD_MODULE_INDICATOR([group-member])
   gl_HUMAN
-  # Code from module include_next:
-  # Code from module inline:
-  gl_INLINE
-  # Code from module intprops:
-  # Code from module inttostr:
   gl_INTTOSTR
-  # Code from module inttypes:
   gl_INTTYPES_H
-  # Code from module iswblank:
+  gl_INTTYPES_INCOMPLETE
+  gl_FUNC_ISATTY
+  if test $REPLACE_ISATTY = 1; then
+    AC_LIBOBJ([isatty])
+    gl_PREREQ_ISATTY
+  fi
+  gl_UNISTD_MODULE_INDICATOR([isatty])
   gl_FUNC_ISWBLANK
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    :
+  else
+    if test $HAVE_ISWBLANK = 0 || test $REPLACE_ISWBLANK = 1; then
+      AC_LIBOBJ([iswblank])
+    fi
+  fi
   gl_WCTYPE_MODULE_INDICATOR([iswblank])
-  # Code from module langinfo:
   gl_LANGINFO_H
-  # Code from module lchown:
+  AC_REQUIRE([gl_LARGEFILE])
   gl_FUNC_LCHOWN
+  if test $HAVE_LCHOWN = 0 || test $REPLACE_LCHOWN = 1; then
+    AC_LIBOBJ([lchown])
+  fi
   gl_UNISTD_MODULE_INDICATOR([lchown])
-  # Code from module link:
   gl_FUNC_LINK
+  if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then
+    AC_LIBOBJ([link])
+  fi
   gl_UNISTD_MODULE_INDICATOR([link])
-  # Code from module link-follow:
   gl_FUNC_LINK_FOLLOWS_SYMLINK
-  # Code from module linkat:
   gl_FUNC_LINKAT
+  if test $HAVE_LINKAT = 0 || test $REPLACE_LINKAT = 1; then
+    AC_LIBOBJ([linkat])
+  fi
+  if test $HAVE_LINKAT = 0; then
+    AC_LIBOBJ([at-func2])
+  fi
   gl_UNISTD_MODULE_INDICATOR([linkat])
-  # Code from module localcharset:
   gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(abs_top_builddir)/$gl_source_base\""
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-  # Code from module lseek:
+  gl_LOCALE_H
+  gl_FUNC_LOCALECONV
+  if test $REPLACE_LOCALECONV = 1; then
+    AC_LIBOBJ([localeconv])
+    gl_PREREQ_LOCALECONV
+  fi
+  gl_LOCALE_MODULE_INDICATOR([localeconv])
   gl_FUNC_LSEEK
+  if test $REPLACE_LSEEK = 1; then
+    AC_LIBOBJ([lseek])
+  fi
   gl_UNISTD_MODULE_INDICATOR([lseek])
-  # Code from module lstat:
   gl_FUNC_LSTAT
+  if test $REPLACE_LSTAT = 1; then
+    AC_LIBOBJ([lstat])
+    gl_PREREQ_LSTAT
+  fi
   gl_SYS_STAT_MODULE_INDICATOR([lstat])
-  # Code from module malloc-gnu:
   gl_FUNC_MALLOC_GNU
+  if test $REPLACE_MALLOC = 1; then
+    AC_LIBOBJ([malloc])
+  fi
   gl_MODULE_INDICATOR([malloc-gnu])
-  # Code from module malloc-posix:
   gl_FUNC_MALLOC_POSIX
+  if test $REPLACE_MALLOC = 1; then
+    AC_LIBOBJ([malloc])
+  fi
   gl_STDLIB_MODULE_INDICATOR([malloc-posix])
-  # Code from module malloca:
   gl_MALLOCA
-  # Code from module mbchar:
   gl_MBCHAR
-  # Code from module mbrtowc:
   gl_FUNC_MBRTOWC
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    AC_LIBOBJ([mbrtowc])
+    gl_PREREQ_MBRTOWC
+  fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
-  # Code from module mbscasecmp:
   gl_STRING_MODULE_INDICATOR([mbscasecmp])
-  # Code from module mbsinit:
   gl_FUNC_MBSINIT
+  if test $HAVE_MBSINIT = 0 || test $REPLACE_MBSINIT = 1; then
+    AC_LIBOBJ([mbsinit])
+    gl_PREREQ_MBSINIT
+  fi
   gl_WCHAR_MODULE_INDICATOR([mbsinit])
-  # Code from module mbsrtowcs:
   gl_FUNC_MBSRTOWCS
+  if test $HAVE_MBSRTOWCS = 0 || test $REPLACE_MBSRTOWCS = 1; then
+    AC_LIBOBJ([mbsrtowcs])
+    AC_LIBOBJ([mbsrtowcs-state])
+    gl_PREREQ_MBSRTOWCS
+  fi
   gl_WCHAR_MODULE_INDICATOR([mbsrtowcs])
-  # Code from module mbtowc:
   gl_FUNC_MBTOWC
+  if test $REPLACE_MBTOWC = 1; then
+    AC_LIBOBJ([mbtowc])
+    gl_PREREQ_MBTOWC
+  fi
   gl_STDLIB_MODULE_INDICATOR([mbtowc])
-  # Code from module mbuiter:
   gl_MBITER
-  # Code from module memchr:
   gl_FUNC_MEMCHR
+  if test $HAVE_MEMCHR = 0 || test $REPLACE_MEMCHR = 1; then
+    AC_LIBOBJ([memchr])
+    gl_PREREQ_MEMCHR
+  fi
   gl_STRING_MODULE_INDICATOR([memchr])
-  # Code from module mempcpy:
   gl_FUNC_MEMPCPY
+  if test $HAVE_MEMPCPY = 0; then
+    AC_LIBOBJ([mempcpy])
+    gl_PREREQ_MEMPCPY
+  fi
   gl_STRING_MODULE_INDICATOR([mempcpy])
-  # Code from module memrchr:
   gl_FUNC_MEMRCHR
+  if test $ac_cv_func_memrchr = no; then
+    AC_LIBOBJ([memrchr])
+    gl_PREREQ_MEMRCHR
+  fi
   gl_STRING_MODULE_INDICATOR([memrchr])
-  # Code from module mkdir:
   gl_FUNC_MKDIR
-  # Code from module mkdtemp:
-  gt_FUNC_MKDTEMP
+  if test $REPLACE_MKDIR = 1; then
+    AC_LIBOBJ([mkdir])
+  fi
+  gl_FUNC_MKDIRAT
+  if test $HAVE_MKDIRAT = 0; then
+    AC_LIBOBJ([mkdirat])
+    gl_PREREQ_MKDIRAT
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([mkdirat])
+  gl_FUNC_MKDTEMP
+  if test $HAVE_MKDTEMP = 0; then
+    AC_LIBOBJ([mkdtemp])
+    gl_PREREQ_MKDTEMP
+  fi
   gl_STDLIB_MODULE_INDICATOR([mkdtemp])
-  # Code from module mkfifo:
   gl_FUNC_MKFIFO
+  if test $HAVE_MKFIFO = 0 || test $REPLACE_MKFIFO = 1; then
+    AC_LIBOBJ([mkfifo])
+  fi
   gl_UNISTD_MODULE_INDICATOR([mkfifo])
-  # Code from module mkfifoat:
   gl_FUNC_MKFIFOAT
-  gl_UNISTD_MODULE_INDICATOR([mkfifoat])
-  gl_UNISTD_MODULE_INDICATOR([mknodat])
-  # Code from module mknod:
+  if test $HAVE_MKFIFOAT = 0; then
+    AC_LIBOBJ([mkfifoat])
+  fi
+  if test $HAVE_MKNODAT = 0; then
+    AC_LIBOBJ([mknodat])
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([mkfifoat])
+  gl_SYS_STAT_MODULE_INDICATOR([mknodat])
   gl_FUNC_MKNOD
+  if test $HAVE_MKNOD = 0 || test $REPLACE_MKNOD = 1; then
+    AC_LIBOBJ([mknod])
+  fi
   gl_UNISTD_MODULE_INDICATOR([mknod])
-  # Code from module mktime:
   gl_FUNC_MKTIME
+  if test $REPLACE_MKTIME = 1; then
+    AC_LIBOBJ([mktime])
+    gl_PREREQ_MKTIME
+  fi
   gl_TIME_MODULE_INDICATOR([mktime])
-  # Code from module modechange:
   gl_MODECHANGE
-  # Code from module multiarch:
+  gl_MSVC_INVAL
+  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+    AC_LIBOBJ([msvc-inval])
+  fi
+  gl_MSVC_NOTHROW
+  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+    AC_LIBOBJ([msvc-nothrow])
+  fi
   gl_MULTIARCH
-  # Code from module nl_langinfo:
   gl_FUNC_NL_LANGINFO
+  if test $HAVE_NL_LANGINFO = 0 || test $REPLACE_NL_LANGINFO = 1; then
+    AC_LIBOBJ([nl_langinfo])
+  fi
   gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
-  # Code from module obstack:
   AC_FUNC_OBSTACK
   dnl Note: AC_FUNC_OBSTACK does AC_LIBSOURCES([obstack.h, obstack.c]).
-  # Code from module open:
   gl_FUNC_OPEN
+  if test $REPLACE_OPEN = 1; then
+    AC_LIBOBJ([open])
+    gl_PREREQ_OPEN
+  fi
   gl_FCNTL_MODULE_INDICATOR([open])
-  # Code from module openat:
   gl_FUNC_OPENAT
-  # Code from module openat-die:
-  # Code from module parse-datetime:
+  if test $HAVE_OPENAT = 0 || test $REPLACE_OPENAT = 1; then
+    AC_LIBOBJ([openat])
+    gl_PREREQ_OPENAT
+  fi
+  gl_MODULE_INDICATOR([openat]) dnl for lib/getcwd.c
+  gl_FCNTL_MODULE_INDICATOR([openat])
+  gl_FUNC_OPENDIR
+  if test $HAVE_OPENDIR = 0 || test $REPLACE_OPENDIR = 1; then
+    AC_LIBOBJ([opendir])
+  fi
+  gl_DIRENT_MODULE_INDICATOR([opendir])
   gl_PARSE_DATETIME
-  # Code from module pathmax:
   gl_PATHMAX
-  # Code from module priv-set:
+  gl_FUNC_POSIX_OPENPT
+  if test $HAVE_POSIX_OPENPT = 0; then
+    AC_LIBOBJ([posix_openpt])
+  fi
+  gl_STDLIB_MODULE_INDICATOR([posix_openpt])
   gl_PRIV_SET
-  # Code from module progname:
   AC_CHECK_DECLS([program_invocation_name], [], [], [#include <errno.h>])
   AC_CHECK_DECLS([program_invocation_short_name], [], [], [#include <errno.h>])
-  # Code from module quote:
+  gl_FUNC_PTSNAME
+  if test $HAVE_PTSNAME = 0 || test $REPLACE_PTSNAME = 1; then
+    AC_LIBOBJ([ptsname])
+    gl_PREREQ_PTSNAME
+  fi
+  gl_STDLIB_MODULE_INDICATOR([ptsname])
+  gl_FUNC_PTSNAME_R
+  if test $HAVE_PTSNAME_R = 0 || test $REPLACE_PTSNAME_R = 1; then
+    AC_LIBOBJ([ptsname_r])
+    gl_PREREQ_PTSNAME_R
+  fi
+  gl_STDLIB_MODULE_INDICATOR([ptsname_r])
+  gl_FUNC_ACL
   gl_QUOTE
-  # Code from module quotearg:
   gl_QUOTEARG
-  # Code from module quotearg-simple:
-  # Code from module rawmemchr:
+  gl_FUNC_RAISE
+  if test $HAVE_RAISE = 0 || test $REPLACE_RAISE = 1; then
+    AC_LIBOBJ([raise])
+    gl_PREREQ_RAISE
+  fi
+  gl_SIGNAL_MODULE_INDICATOR([raise])
   gl_FUNC_RAWMEMCHR
+  if test $HAVE_RAWMEMCHR = 0; then
+    AC_LIBOBJ([rawmemchr])
+    gl_PREREQ_RAWMEMCHR
+  fi
   gl_STRING_MODULE_INDICATOR([rawmemchr])
-  # Code from module readlink:
+  gl_FUNC_READ
+  if test $REPLACE_READ = 1; then
+    AC_LIBOBJ([read])
+    gl_PREREQ_READ
+  fi
+  gl_UNISTD_MODULE_INDICATOR([read])
+  gl_FUNC_READDIR
+  if test $HAVE_READDIR = 0; then
+    AC_LIBOBJ([readdir])
+  fi
+  gl_DIRENT_MODULE_INDICATOR([readdir])
   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])
-  # Code from module readlinkat:
   gl_FUNC_READLINKAT
+  if test $HAVE_READLINKAT = 0; then
+    AC_LIBOBJ([readlinkat])
+  fi
   gl_UNISTD_MODULE_INDICATOR([readlinkat])
-  # Code from module realloc-posix:
   gl_FUNC_REALLOC_POSIX
+  if test $REPLACE_REALLOC = 1; then
+    AC_LIBOBJ([realloc])
+  fi
   gl_STDLIB_MODULE_INDICATOR([realloc-posix])
-  # Code from module regex:
   gl_REGEX
-  # Code from module rename:
+  if test $ac_use_included_regex = yes; then
+    AC_LIBOBJ([regex])
+    gl_PREREQ_REGEX
+  fi
   gl_FUNC_RENAME
+  if test $REPLACE_RENAME = 1; then
+    AC_LIBOBJ([rename])
+  fi
   gl_STDIO_MODULE_INDICATOR([rename])
-  # Code from module renameat:
   gl_FUNC_RENAMEAT
+  if test $HAVE_RENAMEAT = 0 || test $REPLACE_RENAMEAT = 1; then
+    AC_LIBOBJ([renameat])
+  fi
+  if test $HAVE_RENAMEAT = 0; then
+    AC_LIBOBJ([at-func2])
+  fi
   gl_STDIO_MODULE_INDICATOR([renameat])
-  # Code from module rmdir:
+  gl_FUNC_REWINDDIR
+  if test $HAVE_REWINDDIR = 0; then
+    AC_LIBOBJ([rewinddir])
+  fi
+  gl_DIRENT_MODULE_INDICATOR([rewinddir])
   gl_FUNC_RMDIR
+  if test $REPLACE_RMDIR = 1; then
+    AC_LIBOBJ([rmdir])
+  fi
   gl_UNISTD_MODULE_INDICATOR([rmdir])
-  # Code from module rpmatch:
   gl_FUNC_RPMATCH
+  if test $HAVE_RPMATCH = 0; then
+    AC_LIBOBJ([rpmatch])
+    gl_PREREQ_RPMATCH
+  fi
   gl_STDLIB_MODULE_INDICATOR([rpmatch])
-  # Code from module safe-read:
-  gl_SAFE_READ
-  # Code from module safe-write:
-  gl_SAFE_WRITE
-  # Code from module same-inode:
-  # Code from module save-cwd:
+  gl_PREREQ_SAFE_READ
+  gl_PREREQ_SAFE_WRITE
   gl_SAVE_CWD
-  # Code from module savedir:
   gl_SAVEDIR
-  # Code from module setenv:
+  gl_FUNC_SECURE_GETENV
+  if test $HAVE_SECURE_GETENV = 0; then
+    AC_LIBOBJ([secure_getenv])
+    gl_PREREQ_SECURE_GETENV
+  fi
+  gl_STDLIB_MODULE_INDICATOR([secure_getenv])
+  AC_CHECK_HEADERS([selinux/flask.h])
+  AC_LIBOBJ([selinux-at])
+  gl_HEADERS_SELINUX_SELINUX_H
+  gl_HEADERS_SELINUX_CONTEXT_H
+  if test "$with_selinux" != no && test "$ac_cv_header_selinux_selinux_h" = yes; then
+    AC_LIBOBJ([getfilecon])
+  fi
   gl_FUNC_SETENV
+  if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
+    AC_LIBOBJ([setenv])
+  fi
   gl_STDLIB_MODULE_INDICATOR([setenv])
-  # Code from module size_max:
+  gl_SIGNAL_H
   gl_SIZE_MAX
-  # Code from module sleep:
   gl_FUNC_SLEEP
+  if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then
+    AC_LIBOBJ([sleep])
+  fi
   gl_UNISTD_MODULE_INDICATOR([sleep])
-  # Code from module snprintf:
   gl_FUNC_SNPRINTF
   gl_STDIO_MODULE_INDICATOR([snprintf])
   gl_MODULE_INDICATOR([snprintf])
-  # Code from module ssize_t:
   gt_TYPE_SSIZE_T
-  # Code from module stat:
   gl_FUNC_STAT
+  if test $REPLACE_STAT = 1; then
+    AC_LIBOBJ([stat])
+    gl_PREREQ_STAT
+  fi
   gl_SYS_STAT_MODULE_INDICATOR([stat])
-  # Code from module stat-macros:
-  # Code from module stat-time:
   gl_STAT_TIME
   gl_STAT_BIRTHTIME
-  # Code from module stdarg:
+  gl_MODULE_INDICATOR([statat]) dnl for lib/openat.h
+  gl_STDALIGN_H
   gl_STDARG_H
-  # Code from module stdbool:
   AM_STDBOOL_H
-  # Code from module stddef:
   gl_STDDEF_H
-  # Code from module stdint:
   gl_STDINT_H
-  # Code from module stdio:
   gl_STDIO_H
-  # Code from module stdlib:
   gl_STDLIB_H
-  # Code from module stpcpy:
   gl_FUNC_STPCPY
+  if test $HAVE_STPCPY = 0; then
+    AC_LIBOBJ([stpcpy])
+    gl_PREREQ_STPCPY
+  fi
   gl_STRING_MODULE_INDICATOR([stpcpy])
-  # Code from module strcase:
   gl_STRCASE
-  # Code from module strchrnul:
+  if test $HAVE_STRCASECMP = 0; then
+    AC_LIBOBJ([strcasecmp])
+    gl_PREREQ_STRCASECMP
+  fi
+  if test $HAVE_STRNCASECMP = 0; then
+    AC_LIBOBJ([strncasecmp])
+    gl_PREREQ_STRNCASECMP
+  fi
   gl_FUNC_STRCHRNUL
+  if test $HAVE_STRCHRNUL = 0 || test $REPLACE_STRCHRNUL = 1; then
+    AC_LIBOBJ([strchrnul])
+    gl_PREREQ_STRCHRNUL
+  fi
   gl_STRING_MODULE_INDICATOR([strchrnul])
-  # Code from module strdup-posix:
   gl_FUNC_STRDUP_POSIX
+  if test $ac_cv_func_strdup = no || test $REPLACE_STRDUP = 1; then
+    AC_LIBOBJ([strdup])
+    gl_PREREQ_STRDUP
+  fi
   gl_STRING_MODULE_INDICATOR([strdup])
-  # Code from module streq:
-  # Code from module strerror:
   gl_FUNC_STRERROR
+  if test $REPLACE_STRERROR = 1; then
+    AC_LIBOBJ([strerror])
+  fi
+  gl_MODULE_INDICATOR([strerror])
   gl_STRING_MODULE_INDICATOR([strerror])
-  # Code from module string:
+  AC_REQUIRE([gl_HEADER_ERRNO_H])
+  AC_REQUIRE([gl_FUNC_STRERROR_0])
+  if test -n "$ERRNO_H" || test $REPLACE_STRERROR_0 = 1; then
+    AC_LIBOBJ([strerror-override])
+    gl_PREREQ_SYS_H_WINSOCK2
+  fi
+  gl_FUNC_GNU_STRFTIME
   gl_HEADER_STRING_H
-  # Code from module strings:
   gl_HEADER_STRINGS_H
-  # Code from module strndup:
   gl_FUNC_STRNDUP
+  if test $HAVE_STRNDUP = 0 || test $REPLACE_STRNDUP = 1; then
+    AC_LIBOBJ([strndup])
+  fi
   gl_STRING_MODULE_INDICATOR([strndup])
-  # Code from module strnlen:
   gl_FUNC_STRNLEN
+  if test $HAVE_DECL_STRNLEN = 0 || test $REPLACE_STRNLEN = 1; then
+    AC_LIBOBJ([strnlen])
+    gl_PREREQ_STRNLEN
+  fi
   gl_STRING_MODULE_INDICATOR([strnlen])
-  # Code from module strnlen1:
-  # Code from module strtoimax:
   gl_FUNC_STRTOIMAX
+  if test $HAVE_DECL_STRTOIMAX = 0 || test $REPLACE_STRTOIMAX = 1; then
+    AC_LIBOBJ([strtoimax])
+    gl_PREREQ_STRTOIMAX
+  fi
   gl_INTTYPES_MODULE_INDICATOR([strtoimax])
-  # Code from module strtol:
   gl_FUNC_STRTOL
-  # Code from module strtoll:
+  if test $ac_cv_func_strtol = no; then
+    AC_LIBOBJ([strtol])
+  fi
   gl_FUNC_STRTOLL
+  if test $HAVE_STRTOLL = 0; then
+    AC_LIBOBJ([strtoll])
+    gl_PREREQ_STRTOLL
+  fi
   gl_STDLIB_MODULE_INDICATOR([strtoll])
-  # Code from module strtoul:
   gl_FUNC_STRTOUL
-  # Code from module strtoull:
+  if test $ac_cv_func_strtoul = no; then
+    AC_LIBOBJ([strtoul])
+  fi
   gl_FUNC_STRTOULL
+  if test $HAVE_STRTOULL = 0; then
+    AC_LIBOBJ([strtoull])
+    gl_PREREQ_STRTOULL
+  fi
   gl_STDLIB_MODULE_INDICATOR([strtoull])
-  # Code from module strtoumax:
   gl_FUNC_STRTOUMAX
+  if test $HAVE_DECL_STRTOUMAX = 0 || test $REPLACE_STRTOUMAX = 1; then
+    AC_LIBOBJ([strtoumax])
+    gl_PREREQ_STRTOUMAX
+  fi
   gl_INTTYPES_MODULE_INDICATOR([strtoumax])
-  # Code from module symlink:
   gl_FUNC_SYMLINK
+  if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
+    AC_LIBOBJ([symlink])
+  fi
   gl_UNISTD_MODULE_INDICATOR([symlink])
-  # Code from module symlinkat:
   gl_FUNC_SYMLINKAT
+  if test $HAVE_SYMLINKAT = 0; then
+    AC_LIBOBJ([symlinkat])
+  fi
   gl_UNISTD_MODULE_INDICATOR([symlinkat])
-  # Code from module sys_stat:
   gl_HEADER_SYS_STAT_H
   AC_PROG_MKDIR_P
-  # Code from module sys_time:
   gl_HEADER_SYS_TIME_H
   AC_PROG_MKDIR_P
-  # Code from module sysexits:
+  gl_SYS_TYPES_H
+  AC_PROG_MKDIR_P
   gl_SYSEXITS
-  # Code from module tempname:
   gl_FUNC_GEN_TEMPNAME
-  # Code from module time:
   gl_HEADER_TIME_H
-  # Code from module time_r:
   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])
-  # Code from module timespec:
   gl_TIMESPEC
-  # Code from module unistd:
+  gl_FUNC_TTYNAME_R
+  if test $HAVE_TTYNAME_R = 0 || test $REPLACE_TTYNAME_R = 1; then
+    AC_LIBOBJ([ttyname_r])
+    gl_PREREQ_TTYNAME_R
+  fi
+  gl_UNISTD_MODULE_INDICATOR([ttyname_r])
   gl_UNISTD_H
-  # Code from module unistd-safer:
   gl_UNISTD_SAFER
-  # Code from module unitypes:
   gl_LIBUNISTRING_LIBHEADER([0.9], [unitypes.h])
-  # Code from module uniwidth/base:
   gl_LIBUNISTRING_LIBHEADER([0.9], [uniwidth.h])
-  # Code from module uniwidth/width:
   gl_LIBUNISTRING_MODULE([0.9.4], [uniwidth/width])
-  # Code from module unlink:
   gl_FUNC_UNLINK
+  if test $REPLACE_UNLINK = 1; then
+    AC_LIBOBJ([unlink])
+  fi
   gl_UNISTD_MODULE_INDICATOR([unlink])
-  # Code from module unlinkdir:
+  gl_FUNC_UNLINKAT
+  if test $HAVE_UNLINKAT = 0 || test $REPLACE_UNLINKAT = 1; then
+    AC_LIBOBJ([unlinkat])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([unlinkat])
   gl_UNLINKDIR
-  # Code from module unlocked-io:
   gl_FUNC_GLIBC_UNLOCKED_IO
-  # Code from module unsetenv:
+  gl_FUNC_UNLOCKPT
+  if test $HAVE_UNLOCKPT = 0; then
+    AC_LIBOBJ([unlockpt])
+    gl_PREREQ_UNLOCKPT
+  fi
+  gl_STDLIB_MODULE_INDICATOR([unlockpt])
   gl_FUNC_UNSETENV
+  if test $HAVE_UNSETENV = 0 || test $REPLACE_UNSETENV = 1; then
+    AC_LIBOBJ([unsetenv])
+    gl_PREREQ_UNSETENV
+  fi
   gl_STDLIB_MODULE_INDICATOR([unsetenv])
-  # Code from module utimens:
   gl_UTIMENS
-  # Code from module utimensat:
   gl_FUNC_UTIMENSAT
+  if test $HAVE_UTIMENSAT = 0 || test $REPLACE_UTIMENSAT = 1; then
+    AC_LIBOBJ([utimensat])
+  fi
   gl_SYS_STAT_MODULE_INDICATOR([utimensat])
-  # Code from module vasnprintf:
   gl_FUNC_VASNPRINTF
-  # Code from module vasprintf:
   gl_FUNC_VASPRINTF
   gl_STDIO_MODULE_INDICATOR([vasprintf])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=asprintf:2:c-format])
      AM_][XGETTEXT_OPTION([--flag=vasprintf:2:c-format])])
-  # Code from module verify:
-  # Code from module version-etc:
   gl_VERSION_ETC
-  # Code from module version-etc-fsf:
-  # Code from module vsnprintf:
   gl_FUNC_VSNPRINTF
   gl_STDIO_MODULE_INDICATOR([vsnprintf])
-  # Code from module warn-on-use:
-  # Code from module wchar:
   gl_WCHAR_H
-  # Code from module wcrtomb:
   gl_FUNC_WCRTOMB
+  if test $HAVE_WCRTOMB = 0 || test $REPLACE_WCRTOMB = 1; then
+    AC_LIBOBJ([wcrtomb])
+    gl_PREREQ_WCRTOMB
+  fi
   gl_WCHAR_MODULE_INDICATOR([wcrtomb])
-  # Code from module wctype-h:
   gl_WCTYPE_H
-  # Code from module wcwidth:
   gl_FUNC_WCWIDTH
+  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+  fi
   gl_WCHAR_MODULE_INDICATOR([wcwidth])
-  # Code from module write:
   gl_FUNC_WRITE
+  if test $REPLACE_WRITE = 1; then
+    AC_LIBOBJ([write])
+    gl_PREREQ_WRITE
+  fi
   gl_UNISTD_MODULE_INDICATOR([write])
-  # Code from module xalloc:
   gl_XALLOC
-  # Code from module xalloc-die:
-  # Code from module xgetcwd:
   gl_XGETCWD
-  # Code from module xsize:
   gl_XSIZE
-  # Code from module xstrndup:
   gl_XSTRNDUP
-  # Code from module xstrtol:
   gl_XSTRTOL
-  # Code from module xstrtoumax:
-  # Code from module xvasprintf:
   gl_XVASPRINTF
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])])
@@ -873,14 +1255,23 @@ AC_DEFUN([gltests_LIBSOURCES], [
 # This macro records the list of files which have been installed by
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([gl_FILE_LIST], [
-  build-aux/arg-nonnull.h
-  build-aux/c++defs.h
   build-aux/config.rpath
+  build-aux/git-log-fix
   build-aux/gitlog-to-changelog
-  build-aux/warn-on-use.h
+  build-aux/snippet/_Noreturn.h
+  build-aux/snippet/arg-nonnull.h
+  build-aux/snippet/c++defs.h
+  build-aux/snippet/unused-parameter.h
+  build-aux/snippet/warn-on-use.h
   doc/parse-datetime.texi
+  lib/acl-errno-valid.c
+  lib/acl-internal.h
+  lib/acl.h
+  lib/acl_entries.c
   lib/alloca.c
   lib/alloca.in.h
+  lib/allocator.c
+  lib/allocator.h
   lib/anytostr.c
   lib/areadlink.c
   lib/areadlink.h
@@ -910,25 +1301,35 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/backupfile.h
   lib/basename-lgpl.c
   lib/basename.c
+  lib/bitrotate.c
   lib/bitrotate.h
   lib/btowc.c
   lib/c-ctype.c
   lib/c-ctype.h
+  lib/c-strcase.h
+  lib/c-strcasecmp.c
+  lib/c-strcaseeq.h
+  lib/c-strncasecmp.c
   lib/canonicalize-lgpl.c
+  lib/careadlinkat.c
+  lib/careadlinkat.h
   lib/chdir-long.c
   lib/chdir-long.h
+  lib/chmodat.c
   lib/chown.c
+  lib/chownat.c
   lib/cloexec.c
   lib/cloexec.h
-  lib/close-hook.c
-  lib/close-hook.h
   lib/close-stream.c
   lib/close-stream.h
   lib/close.c
+  lib/closedir.c
   lib/closeout.c
   lib/closeout.h
   lib/config.charset
+  lib/copy-acl.c
   lib/dirent--.h
+  lib/dirent-private.h
   lib/dirent-safer.h
   lib/dirent.in.h
   lib/dirfd.c
@@ -937,42 +1338,56 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/dirname.h
   lib/dosname.h
   lib/dup-safer.c
+  lib/dup.c
   lib/dup2.c
   lib/errno.in.h
   lib/error.c
   lib/error.h
+  lib/euidaccess.c
   lib/exclude.c
   lib/exclude.h
   lib/exitfail.c
   lib/exitfail.h
+  lib/faccessat.c
   lib/fchdir.c
   lib/fchmodat.c
   lib/fchown-stub.c
   lib/fchownat.c
-  lib/fclose.c
   lib/fcntl.c
   lib/fcntl.in.h
+  lib/fd-hook.c
+  lib/fd-hook.h
   lib/fd-safer.c
   lib/fdopendir.c
   lib/fdutimensat.c
+  lib/file-has-acl.c
   lib/fileblocks.c
+  lib/filename.h
   lib/filenamecat-lgpl.c
   lib/filenamecat.h
   lib/float+.h
+  lib/float.c
   lib/float.in.h
   lib/fnmatch.c
   lib/fnmatch.in.h
   lib/fnmatch_loop.c
   lib/fpending.c
   lib/fpending.h
+  lib/fprintftime.c
+  lib/fprintftime.h
+  lib/fseek.c
   lib/fseeko.c
+  lib/fstat.c
   lib/fstatat.c
   lib/full-write.c
   lib/full-write.h
   lib/futimens.c
+  lib/getcwd-lgpl.c
   lib/getcwd.c
   lib/getdelim.c
   lib/getdtablesize.c
+  lib/getfilecon.c
+  lib/getgroups.c
   lib/getline.c
   lib/getopt.c
   lib/getopt.in.h
@@ -982,6 +1397,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/gettext.h
   lib/gettime.c
   lib/gettimeofday.c
+  lib/group-member.c
   lib/hash.c
   lib/hash.h
   lib/human.c
@@ -991,13 +1407,17 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/inttostr.c
   lib/inttostr.h
   lib/inttypes.in.h
+  lib/isatty.c
   lib/iswblank.c
+  lib/itold.c
   lib/langinfo.in.h
   lib/lchown.c
   lib/link.c
   lib/linkat.c
   lib/localcharset.c
   lib/localcharset.h
+  lib/locale.in.h
+  lib/localeconv.c
   lib/lseek.c
   lib/lstat.c
   lib/malloc.c
@@ -1014,6 +1434,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/mbsrtowcs.c
   lib/mbtowc-impl.h
   lib/mbtowc.c
+  lib/mbuiter.c
   lib/mbuiter.h
   lib/memchr.c
   lib/memchr.valgrind
@@ -1030,6 +1451,10 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/mktime.c
   lib/modechange.c
   lib/modechange.h
+  lib/msvc-inval.c
+  lib/msvc-inval.h
+  lib/msvc-nothrow.c
+  lib/msvc-nothrow.h
   lib/nl_langinfo.c
   lib/obstack.c
   lib/obstack.h
@@ -1041,10 +1466,12 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/openat.c
   lib/openat.h
   lib/opendir-safer.c
+  lib/opendir.c
   lib/parse-datetime.h
   lib/parse-datetime.y
   lib/pathmax.h
   lib/pipe-safer.c
+  lib/posix_openpt.c
   lib/printf-args.c
   lib/printf-args.h
   lib/printf-parse.c
@@ -1053,12 +1480,18 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/priv-set.h
   lib/progname.c
   lib/progname.h
-  lib/quote.c
+  lib/ptsname.c
+  lib/ptsname_r.c
+  lib/qcopy-acl.c
+  lib/qset-acl.c
   lib/quote.h
   lib/quotearg.c
   lib/quotearg.h
+  lib/raise.c
   lib/rawmemchr.c
   lib/rawmemchr.valgrind
+  lib/read.c
+  lib/readdir.c
   lib/readlink.c
   lib/readlinkat.c
   lib/realloc.c
@@ -1072,7 +1505,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/regexec.c
   lib/rename.c
   lib/renameat.c
+  lib/rewinddir.c
   lib/rmdir.c
+  lib/root-uid.h
   lib/rpmatch.c
   lib/safe-read.c
   lib/safe-read.h
@@ -1083,13 +1518,25 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/save-cwd.h
   lib/savedir.c
   lib/savedir.h
+  lib/se-context.c
+  lib/se-context.in.h
+  lib/se-selinux.c
+  lib/se-selinux.in.h
+  lib/secure_getenv.c
+  lib/selinux-at.c
+  lib/selinux-at.h
+  lib/set-acl.c
   lib/setenv.c
+  lib/signal.in.h
   lib/size_max.h
   lib/sleep.c
   lib/snprintf.c
   lib/stat-macros.h
+  lib/stat-time.c
   lib/stat-time.h
   lib/stat.c
+  lib/statat.c
+  lib/stdalign.in.h
   lib/stdarg.in.h
   lib/stdbool.in.h
   lib/stddef.in.h
@@ -1103,7 +1550,11 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/strchrnul.valgrind
   lib/strdup.c
   lib/streq.h
+  lib/strerror-override.c
+  lib/strerror-override.h
   lib/strerror.c
+  lib/strftime.c
+  lib/strftime.h
   lib/string.in.h
   lib/strings.in.h
   lib/stripslash.c
@@ -1122,16 +1573,20 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/symlinkat.c
   lib/sys_stat.in.h
   lib/sys_time.in.h
+  lib/sys_types.in.h
   lib/sysexits.in.h
   lib/tempname.c
   lib/tempname.h
   lib/time.in.h
   lib/time_r.c
+  lib/timespec.c
   lib/timespec.h
+  lib/ttyname_r.c
   lib/uinttostr.c
   lib/umaxtostr.c
   lib/unistd--.h
   lib/unistd-safer.h
+  lib/unistd.c
   lib/unistd.in.h
   lib/unitypes.in.h
   lib/uniwidth.in.h
@@ -1142,6 +1597,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/unlinkdir.c
   lib/unlinkdir.h
   lib/unlocked-io.h
+  lib/unlockpt.c
   lib/unsetenv.c
   lib/utimens.c
   lib/utimens.h
@@ -1156,15 +1612,18 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/vsnprintf.c
   lib/wchar.in.h
   lib/wcrtomb.c
+  lib/wctype-h.c
   lib/wctype.in.h
   lib/wcwidth.c
   lib/write.c
   lib/xalloc-die.c
+  lib/xalloc-oversized.h
   lib/xalloc.h
   lib/xasprintf.c
   lib/xgetcwd.c
   lib/xgetcwd.h
   lib/xmalloc.c
+  lib/xsize.c
   lib/xsize.h
   lib/xstrndup.c
   lib/xstrndup.h
@@ -1176,8 +1635,9 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/xvasprintf.c
   lib/xvasprintf.h
   m4/00gnulib.m4
+  m4/absolute-header.m4
+  m4/acl.m4
   m4/alloca.m4
-  m4/argmatch.m4
   m4/argp.m4
   m4/backupfile.m4
   m4/bison.m4
@@ -1186,9 +1646,9 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/chdir-long.m4
   m4/chown.m4
   m4/clock_time.m4
-  m4/cloexec.m4
   m4/close-stream.m4
   m4/close.m4
+  m4/closedir.m4
   m4/closeout.m4
   m4/codeset.m4
   m4/configmake.m4
@@ -1198,15 +1658,20 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/dirfd.m4
   m4/dirname.m4
   m4/double-slash-root.m4
+  m4/dup.m4
   m4/dup2.m4
   m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
   m4/error.m4
-  m4/exclude.m4
+  m4/euidaccess.m4
+  m4/exponentd.m4
   m4/extensions.m4
+  m4/extern-inline.m4
+  m4/faccessat.m4
   m4/fchdir.m4
-  m4/fclose.m4
+  m4/fchmodat.m4
+  m4/fchownat.m4
   m4/fcntl-o.m4
   m4/fcntl.m4
   m4/fcntl_h.m4
@@ -1216,13 +1681,17 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/float_h.m4
   m4/fnmatch.m4
   m4/fpending.m4
+  m4/fseek.m4
   m4/fseeko.m4
+  m4/fstat.m4
+  m4/fstatat.m4
   m4/futimens.m4
   m4/getcwd-abort-bug.m4
   m4/getcwd-path-max.m4
   m4/getcwd.m4
   m4/getdelim.m4
   m4/getdtablesize.m4
+  m4/getgroups.m4
   m4/getline.m4
   m4/getopt.m4
   m4/getpagesize.m4
@@ -1232,11 +1701,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/glibc2.m4
   m4/glibc21.m4
   m4/gnulib-common.m4
-  m4/hash.m4
+  m4/group-member.m4
   m4/human.m4
   m4/iconv.m4
   m4/include_next.m4
-  m4/inline.m4
   m4/intdiv0.m4
   m4/intl.m4
   m4/intldir.m4
@@ -1247,8 +1715,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/inttypes-pri.m4
   m4/inttypes.m4
   m4/inttypes_h.m4
+  m4/isatty.m4
   m4/iswblank.m4
   m4/langinfo_h.m4
+  m4/largefile.m4
   m4/lchown.m4
   m4/lcmessage.m4
   m4/lib-ld.m4
@@ -1262,12 +1732,16 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/locale-fr.m4
   m4/locale-ja.m4
   m4/locale-zh.m4
+  m4/locale_h.m4
+  m4/localeconv.m4
   m4/lock.m4
   m4/longlong.m4
   m4/lseek.m4
   m4/lstat.m4
   m4/malloc.m4
   m4/malloca.m4
+  m4/manywarnings.m4
+  m4/math_h.m4
   m4/mbchar.m4
   m4/mbiter.m4
   m4/mbrtowc.m4
@@ -1279,6 +1753,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/mempcpy.m4
   m4/memrchr.m4
   m4/mkdir.m4
+  m4/mkdirat.m4
   m4/mkdtemp.m4
   m4/mkfifo.m4
   m4/mkfifoat.m4
@@ -1287,40 +1762,57 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/mmap-anon.m4
   m4/mode_t.m4
   m4/modechange.m4
+  m4/msvc-inval.m4
+  m4/msvc-nothrow.m4
   m4/multiarch.m4
   m4/nl_langinfo.m4
   m4/nls.m4
+  m4/nocrash.m4
+  m4/off_t.m4
   m4/open.m4
   m4/openat.m4
+  m4/opendir.m4
   m4/parse-datetime.m4
   m4/pathmax.m4
   m4/po.m4
+  m4/posix_openpt.m4
   m4/printf-posix.m4
   m4/printf.m4
   m4/priv-set.m4
   m4/progtest.m4
+  m4/ptsname.m4
+  m4/ptsname_r.m4
   m4/quote.m4
   m4/quotearg.m4
+  m4/raise.m4
   m4/rawmemchr.m4
+  m4/read.m4
+  m4/readdir.m4
   m4/readlink.m4
   m4/readlinkat.m4
   m4/realloc.m4
   m4/regex.m4
   m4/rename.m4
   m4/renameat.m4
+  m4/rewinddir.m4
   m4/rmdir.m4
   m4/rpmatch.m4
   m4/safe-read.m4
   m4/safe-write.m4
   m4/save-cwd.m4
   m4/savedir.m4
+  m4/secure_getenv.m4
+  m4/selinux-context-h.m4
+  m4/selinux-selinux-h.m4
   m4/setenv.m4
+  m4/signal_h.m4
   m4/size_max.m4
   m4/sleep.m4
   m4/snprintf.m4
   m4/ssize_t.m4
   m4/stat-time.m4
   m4/stat.m4
+  m4/stdalign.m4
   m4/stdarg.m4
   m4/stdbool.m4
   m4/stddef_h.m4
@@ -1333,6 +1825,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/strchrnul.m4
   m4/strdup.m4
   m4/strerror.m4
+  m4/strftime.m4
   m4/string_h.m4
   m4/strings_h.m4
   m4/strndup.m4
@@ -1345,8 +1838,10 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/strtoumax.m4
   m4/symlink.m4
   m4/symlinkat.m4
+  m4/sys_socket_h.m4
   m4/sys_stat_h.m4
   m4/sys_time_h.m4
+  m4/sys_types_h.m4
   m4/sysexits.m4
   m4/tempname.m4
   m4/threadlib.m4
@@ -1354,12 +1849,15 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/time_r.m4
   m4/timespec.m4
   m4/tm_gmtoff.m4
+  m4/ttyname_r.m4
   m4/uintmax_t.m4
   m4/unistd-safer.m4
   m4/unistd_h.m4
   m4/unlink.m4
+  m4/unlinkat.m4
   m4/unlinkdir.m4
   m4/unlocked-io.m4
+  m4/unlockpt.m4
   m4/utimbuf.m4
   m4/utimens.m4
   m4/utimensat.m4
@@ -1370,6 +1868,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/visibility.m4
   m4/vsnprintf.m4
   m4/warn-on-use.m4
+  m4/warnings.m4
   m4/wchar_h.m4
   m4/wchar_t.m4
   m4/wcrtomb.m4