Imported Upstream version 1.4.19

[platform/upstream/m4.git] / m4 / gnulib-comp.m4

diff --git a/m4/gnulib-comp.m4 b/m4/gnulib-comp.m4
index 9a51c9f..fccda9a 100644 (file)
--- a/m4/gnulib-comp.m4
+++ b/m4/gnulib-comp.m4
@@ -1,10 +1,22 @@
 # DO NOT EDIT! GENERATED AUTOMATICALLY!
-# Copyright (C) 2002-2011 Free Software Foundation, Inc.
+# Copyright (C) 2002-2021 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 <https://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.
@@ -25,79 +37,157 @@ AC_DEFUN([M4_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])
+
+  # Pre-early section.
+  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  AC_REQUIRE([gl_PROG_AR_RANLIB])
+
   AC_REQUIRE([AM_PROG_CC_C_O])
+  # Code from module absolute-header:
+  # Code from module accept:
+  # Code from module accept-tests:
+  # Code from module access:
+  # Code from module access-tests:
+  # Code from module alignof:
+  # Code from module alignof-tests:
+  # Code from module alloca:
   # Code from module alloca-opt:
   # Code from module alloca-opt-tests:
   # Code from module announce-gen:
   # Code from module ansi-c++-opt:
-  # Code from module arg-nonnull:
+  AC_REQUIRE([gl_ANSI_CXX])
+  # Code from module arpa_inet:
+  # Code from module arpa_inet-c++-tests:
+  # Code from module arpa_inet-tests:
   # Code from module array-list:
   # Code from module array-list-tests:
   # Code from module array-oset:
   # Code from module array-oset-tests:
   # Code from module assert:
+  # Code from module assure:
+  # Code from module asyncsafe-spin:
+  # Code from module asyncsafe-spin-tests:
+  # Code from module at-internal:
+  # Code from module attribute:
   # Code from module autobuild:
   AB_INIT
   # Code from module avltree-oset:
   # Code from module avltree-oset-tests:
+  # Code from module basename-lgpl:
   # Code from module binary-io:
   # Code from module binary-io-tests:
+  # Code from module bind:
+  # Code from module bind-tests:
+  # Code from module bitrotate:
+  # Code from module bitrotate-tests:
   # Code from module btowc:
   # Code from module btowc-tests:
-  # Code from module c++defs:
+  # Code from module builtin-expect:
   # Code from module c-ctype:
   # Code from module c-ctype-tests:
   # Code from module c-stack:
   # Code from module c-stack-tests:
   # Code from module c-strcase:
   # Code from module c-strcase-tests:
+  # Code from module c-strcaseeq:
+  # Code from module c99:
+  # Code from module calloc-gnu:
+  # Code from module calloc-gnu-tests:
+  # Code from module calloc-posix:
+  # Code from module canonicalize:
   # Code from module canonicalize-lgpl:
   # Code from module canonicalize-lgpl-tests:
+  # Code from module canonicalize-tests:
+  # Code from module chdir:
+  # Code from module chdir-long:
+  # Code from module chdir-tests:
   # Code from module clean-temp:
+  # Code from module clean-temp-simple:
+  # Code from module clock-time:
   # Code from module cloexec:
   # Code from module cloexec-tests:
   # Code from module close:
-  # Code from module close-hook:
   # Code from module close-stream:
+  # Code from module close-tests:
+  # Code from module closedir:
   # Code from module closein:
   # Code from module closein-tests:
   # Code from module closeout:
+  # Code from module concat-filename:
   # Code from module config-h:
   # Code from module configmake:
+  # Code from module connect:
+  # Code from module connect-tests:
+  # Code from module creat:
+  # Code from module creat-tests:
+  # Code from module ctype:
+  # Code from module ctype-c++-tests:
+  # Code from module ctype-tests:
+  # Code from module d-ino:
+  # Code from module dirent:
+  # Code from module dirent-c++-tests:
+  # Code from module dirent-tests:
+  # Code from module dirfd:
   # Code from module dirname:
   # Code from module dirname-lgpl:
   # Code from module dirname-tests:
-  # Code from module dosname:
+  # Code from module do-release-commit-and-tag:
   # Code from module double-slash-root:
+  # Code from module dup:
+  # Code from module dup-tests:
   # Code from module dup2:
   # Code from module dup2-tests:
+  # Code from module dynarray:
+  # Code from module dynarray-tests:
+  # Code from module eloop-threshold:
   # Code from module environ:
   # Code from module environ-tests:
   # Code from module errno:
+  # Code from module errno-c++-tests:
   # Code from module errno-tests:
   # Code from module error:
   # Code from module execute:
+  # Code from module execute-tests:
   # Code from module exitfail:
+  # Code from module explicit_bzero:
+  # Code from module explicit_bzero-tests:
   # Code from module extensions:
-  AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+  # Code from module extern-inline:
   # Code from module fatal-signal:
+  # Code from module fchdir:
+  # Code from module fchdir-tests:
   # Code from module fclose:
+  # Code from module fclose-tests:
   # Code from module fcntl:
   # Code from module fcntl-h:
   # Code from module fcntl-h-c++-tests:
   # Code from module fcntl-h-tests:
   # Code from module fcntl-tests:
+  # Code from module fd-hook:
   # Code from module fd-safer-flag:
   # Code from module fdl-1.3:
+  # Code from module fdopen:
+  # Code from module fdopen-tests:
+  # Code from module fdopendir:
+  # Code from module fdopendir-tests:
   # Code from module fflush:
-  AC_REQUIRE([AC_FUNC_FSEEKO])
+  AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
   # Code from module fflush-tests:
+  # Code from module fgetc-tests:
+  # Code from module file-set:
+  # Code from module filename:
   # Code from module filenamecat:
   # Code from module filenamecat-lgpl:
   # Code from module filenamecat-tests:
+  # Code from module findprog:
+  # Code from module findprog-in:
+  # Code from module flexmember:
   # Code from module float:
+  # Code from module float-c++-tests:
+  # Code from module float-tests:
   # Code from module fopen:
+  # Code from module fopen-gnu:
+  # Code from module fopen-gnu-tests:
   # Code from module fopen-safer:
   # Code from module fopen-safer-tests:
   # Code from module fopen-tests:
@@ -108,62 +198,132 @@ AC_DEFUN([M4_EARLY],
   # Code from module fpucw:
   # Code from module fpurge:
   # Code from module fpurge-tests:
+  # Code from module fputc-tests:
+  # Code from module fread-tests:
   # Code from module freadahead:
   # Code from module freadahead-tests:
   # Code from module freading:
   # Code from module freading-tests:
+  # Code from module free-posix:
+  # Code from module free-posix-tests:
+  # Code from module freopen:
+  # Code from module freopen-tests:
   # Code from module frexp-nolibm:
   # Code from module frexp-nolibm-tests:
   # Code from module frexpl-nolibm:
   # Code from module frexpl-nolibm-tests:
+  # Code from module fseek:
+  # Code from module fseek-tests:
   # Code from module fseeko:
-  AC_REQUIRE([AC_FUNC_FSEEKO])
+  AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
   # Code from module fseeko-tests:
+  # Code from module fstat:
+  # Code from module fstat-tests:
+  # Code from module fstatat:
+  # Code from module fstatat-tests:
   # Code from module ftell:
   # Code from module ftell-tests:
   # Code from module ftello:
-  AC_REQUIRE([AC_FUNC_FSEEKO])
+  AC_REQUIRE([gl_SET_LARGEFILE_SOURCE])
   # Code from module ftello-tests:
+  # Code from module ftruncate:
+  # Code from module ftruncate-tests:
+  # Code from module fwrite-tests:
   # Code from module gendocs:
+  # Code from module getcwd:
+  # Code from module getcwd-lgpl:
+  # Code from module getcwd-lgpl-tests:
+  # Code from module getcwd-tests:
   # Code from module getdtablesize:
   # Code from module getdtablesize-tests:
   # Code from module getopt-gnu:
+  # Code from module getopt-gnu-tests:
   # Code from module getopt-posix:
-  # Code from module getopt-posix-tests:
   # Code from module getpagesize:
+  # Code from module getprogname:
+  # Code from module getprogname-tests:
+  # Code from module getrandom:
+  # Code from module getrandom-tests:
   # Code from module gettext-h:
   # Code from module gettimeofday:
   # Code from module gettimeofday-tests:
   # Code from module git-version-gen:
+  # Code from module gitlog-to-changelog:
   # Code from module gnu-web-doc-update:
   # Code from module gnumakefile:
   # Code from module gnupload:
+  # Code from module gperf:
   # Code from module gpl-3.0:
+  # Code from module hard-locale:
+  # Code from module hard-locale-tests:
+  # Code from module hash:
+  # Code from module hash-pjw:
+  # Code from module hash-tests:
+  # Code from module hash-triple-simple:
   # Code from module havelib:
+  # Code from module host-cpu-c-abi:
+  # Code from module iconv:
+  # Code from module iconv-h:
+  # Code from module iconv-h-c++-tests:
+  # Code from module iconv-h-tests:
+  # Code from module iconv-tests:
+  # Code from module iconv_open:
+  # Code from module idx:
   # Code from module ignore-value:
   # Code from module ignore-value-tests:
   # Code from module include_next:
+  # Code from module inet_pton:
+  # Code from module inet_pton-tests:
   # Code from module inline:
   # Code from module intprops:
+  # Code from module intprops-tests:
+  # Code from module inttostr:
+  # Code from module inttostr-tests:
+  # Code from module inttypes:
+  # Code from module inttypes-c++-tests:
+  # Code from module inttypes-incomplete:
+  # Code from module inttypes-tests:
+  # Code from module ioctl:
+  # Code from module ioctl-tests:
+  # Code from module isblank:
+  # Code from module isblank-tests:
   # Code from module isnand-nolibm:
   # Code from module isnand-nolibm-tests:
   # Code from module isnanf-nolibm:
   # Code from module isnanf-nolibm-tests:
   # Code from module isnanl-nolibm:
   # Code from module isnanl-nolibm-tests:
+  # Code from module iswblank:
+  # Code from module iswblank-tests:
+  # Code from module iswdigit:
+  # Code from module iswdigit-tests:
+  # Code from module iswxdigit:
+  # Code from module iswxdigit-tests:
   # Code from module langinfo:
   # Code from module langinfo-c++-tests:
   # Code from module langinfo-tests:
-  # Code from module libsigsegv:
+  # Code from module largefile:
+  AC_REQUIRE([AC_SYS_LARGEFILE])
+  # Code from module libc-config:
+  # Code from module limits-h:
+  # Code from module limits-h-c++-tests:
+  # Code from module limits-h-tests:
   # Code from module link:
   # Code from module link-tests:
+  # Code from module linked-list:
+  # Code from module linked-list-tests:
   # Code from module linkedhash-list:
   # Code from module linkedhash-list-tests:
   # Code from module list:
+  # Code from module listen:
+  # Code from module listen-tests:
   # Code from module localcharset:
+  # Code from module localcharset-tests:
   # Code from module locale:
   # Code from module locale-c++-tests:
   # Code from module locale-tests:
+  # Code from module localeconv:
+  # Code from module localeconv-tests:
   # Code from module localename:
   # Code from module localename-tests:
   # Code from module lock:
@@ -181,38 +341,74 @@ AC_DEFUN([M4_EARLY],
   # Code from module math:
   # Code from module math-c++-tests:
   # Code from module math-tests:
+  # Code from module mbchar:
+  # Code from module mbiter:
   # Code from module mbrtowc:
   # Code from module mbrtowc-tests:
   # Code from module mbsinit:
   # Code from module mbsinit-tests:
+  # Code from module mbslen:
+  # Code from module mbsstr:
+  # Code from module mbsstr-tests:
   # Code from module mbtowc:
+  # Code from module mbuiter:
   # Code from module memchr:
   # Code from module memchr-tests:
   # Code from module memchr2:
   # Code from module memchr2-tests:
+  # Code from module mempcpy:
+  # Code from module memrchr:
+  # Code from module memrchr-tests:
+  # Code from module minmax:
+  # Code from module mkdir:
+  # Code from module mkdir-tests:
   # Code from module mkdtemp:
   # Code from module mkstemp:
+  # Code from module msvc-inval:
+  # Code from module msvc-nothrow:
   # Code from module multiarch:
+  # Code from module nanosleep:
+  # Code from module nanosleep-tests:
+  # Code from module netinet_in:
+  # Code from module netinet_in-tests:
   # Code from module nl_langinfo:
   # Code from module nl_langinfo-tests:
   # Code from module nocrash:
   # Code from module obstack:
   # Code from module open:
   # Code from module open-tests:
+  # Code from module openat:
+  # Code from module openat-die:
+  # Code from module openat-h:
+  # Code from module openat-tests:
+  # Code from module opendir:
   # Code from module oset:
   # Code from module pathmax:
+  # Code from module pathmax-tests:
+  # Code from module perror:
+  # Code from module perror-tests:
+  # Code from module pipe-posix:
+  # Code from module pipe-posix-tests:
   # Code from module pipe2:
   # Code from module pipe2-safer:
   # Code from module pipe2-tests:
+  # Code from module posix_spawn:
   # Code from module posix_spawn-internal:
+  # Code from module posix_spawn-tests:
+  # Code from module posix_spawn_file_actions_addchdir:
+  # Code from module posix_spawn_file_actions_addchdir-tests:
   # Code from module posix_spawn_file_actions_addclose:
+  # Code from module posix_spawn_file_actions_addclose-tests:
   # Code from module posix_spawn_file_actions_adddup2:
+  # Code from module posix_spawn_file_actions_adddup2-tests:
   # Code from module posix_spawn_file_actions_addopen:
+  # Code from module posix_spawn_file_actions_addopen-tests:
   # Code from module posix_spawn_file_actions_destroy:
   # Code from module posix_spawn_file_actions_init:
   # Code from module posix_spawnattr_destroy:
   # Code from module posix_spawnattr_init:
   # Code from module posix_spawnattr_setflags:
+  # Code from module posix_spawnattr_setpgroup:
   # Code from module posix_spawnattr_setsigmask:
   # Code from module posix_spawnp:
   # Code from module posix_spawnp-tests:
@@ -222,37 +418,90 @@ AC_DEFUN([M4_EARLY],
   # Code from module printf-frexpl-tests:
   # Code from module printf-safe:
   # Code from module progname:
+  # Code from module propername:
+  # Code from module pthread-h:
+  gl_ANYTHREADLIB_EARLY
+  # Code from module pthread-h-c++-tests:
+  # Code from module pthread-h-tests:
+  # Code from module pthread-thread:
+  # Code from module pthread-thread-tests:
+  # Code from module pthread_sigmask:
+  # Code from module pthread_sigmask-tests:
   # Code from module putenv:
   # Code from module quotearg:
   # Code from module quotearg-simple:
   # Code from module quotearg-simple-tests:
+  # Code from module raise:
+  # Code from module raise-tests:
   # Code from module rawmemchr:
   # Code from module rawmemchr-tests:
+  # Code from module read-file:
+  # Code from module read-file-tests:
+  # Code from module readdir:
   # Code from module readlink:
   # Code from module readlink-tests:
+  # Code from module realloc-gnu:
+  # Code from module realloc-gnu-tests:
+  # Code from module realloc-posix:
+  # Code from module reallocarray:
+  # Code from module reallocarray-tests:
   # Code from module regex:
+  # Code from module regex-tests:
   # Code from module rename:
   # Code from module rename-tests:
+  # Code from module rewinddir:
   # Code from module rmdir:
   # Code from module rmdir-tests:
+  # Code from module root-uid:
   # Code from module same-inode:
+  # Code from module save-cwd:
   # Code from module sched:
   # Code from module sched-tests:
+  # Code from module sched_yield:
+  # Code from module scratch_buffer:
+  # Code from module scratch_buffer-tests:
+  # Code from module secure_getenv:
+  # Code from module select:
+  # Code from module select-tests:
   # Code from module setenv:
   # Code from module setenv-tests:
   # Code from module setlocale:
+  # Code from module setlocale-null:
+  # Code from module setlocale-null-tests:
   # Code from module setlocale-tests:
+  # Code from module setsockopt:
+  # Code from module setsockopt-tests:
+  # Code from module sh-filename:
   # Code from module sigaction:
   # Code from module sigaction-tests:
-  # Code from module signal:
-  # Code from module signal-c++-tests:
-  # Code from module signal-tests:
+  # Code from module signal-h:
+  # Code from module signal-h-c++-tests:
+  # Code from module signal-h-tests:
   # Code from module signbit:
   # Code from module signbit-tests:
+  # Code from module sigpipe:
+  # Code from module sigpipe-tests:
   # Code from module sigprocmask:
+  # Code from module sigprocmask-tests:
+  # Code from module sigsegv:
+  # Code from module sigsegv-tests:
   # Code from module size_max:
+  # Code from module sleep:
+  # Code from module sleep-tests:
+  # 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 snprintf-tests:
+  # Code from module socket:
+  # Code from module socketlib:
+  # Code from module sockets:
+  # Code from module sockets-tests:
+  # Code from module socklen:
+  # Code from module sparcv8+:
+  gl_SPARC_V8PLUS
   # Code from module spawn:
   # Code from module spawn-c++-tests:
   # Code from module spawn-pipe:
@@ -261,17 +510,24 @@ AC_DEFUN([M4_EARLY],
   # Code from module ssize_t:
   # Code from module stat:
   # Code from module stat-tests:
+  # Code from module stat-time:
+  # Code from module stat-time-tests:
+  # Code from module std-gnu11:
+  # Code from module stdalign:
+  # Code from module stdalign-tests:
   # 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 shouldn't hurt, though installers are on their own to set c99 mode.
-  AC_REQUIRE([AC_PROG_CC_STDC])
+  dnl for the builtin va_copy to work.  gl_PROG_CC_C99 arranges for this.
+  gl_PROG_CC_C99
+  # Code from module stdarg-tests:
   # Code from module stdbool:
+  # Code from module stdbool-c++-tests:
   # Code from module stdbool-tests:
   # Code from module stddef:
+  # Code from module stddef-c++-tests:
   # Code from module stddef-tests:
   # Code from module stdint:
+  # Code from module stdint-c++-tests:
   # Code from module stdint-tests:
   # Code from module stdio:
   # Code from module stdio-c++-tests:
@@ -280,18 +536,25 @@ AC_DEFUN([M4_EARLY],
   # Code from module stdlib-c++-tests:
   # Code from module stdlib-safer:
   # Code from module stdlib-tests:
+  # Code from module stpcpy:
   # Code from module strchrnul:
   # Code from module strchrnul-tests:
   # Code from module strdup-posix:
   # Code from module streq:
   # Code from module strerror:
+  # Code from module strerror-override:
   # Code from module strerror-tests:
+  # Code from module strerror_r-posix:
+  # Code from module strerror_r-posix-tests:
+  # Code from module striconv:
+  # Code from module striconv-tests:
   # Code from module string:
   # Code from module string-c++-tests:
   # Code from module string-tests:
   # Code from module strndup:
   # Code from module strnlen:
   # Code from module strnlen-tests:
+  # Code from module strnlen1:
   # Code from module strsignal:
   # Code from module strsignal-tests:
   # Code from module strstr:
@@ -299,19 +562,40 @@ AC_DEFUN([M4_EARLY],
   # Code from module strstr-tests:
   # Code from module strtod:
   # Code from module strtod-tests:
-  # Code from module strtol:
   # Code from module symlink:
   # Code from module symlink-tests:
+  # Code from module sys_ioctl:
+  # Code from module sys_ioctl-c++-tests:
+  # Code from module sys_ioctl-tests:
+  # Code from module sys_random:
+  # Code from module sys_random-c++-tests:
+  # Code from module sys_random-tests:
+  # Code from module sys_select:
+  # Code from module sys_select-c++-tests:
+  # Code from module sys_select-tests:
+  # Code from module sys_socket:
+  # Code from module sys_socket-c++-tests:
+  # Code from module sys_socket-tests:
   # Code from module sys_stat:
   # Code from module sys_stat-c++-tests:
   # Code from module sys_stat-tests:
   # Code from module sys_time:
   # Code from module sys_time-c++-tests:
   # Code from module sys_time-tests:
+  # Code from module sys_types:
+  # Code from module sys_types-c++-tests:
+  # Code from module sys_types-tests:
+  # Code from module sys_uio:
+  # Code from module sys_uio-tests:
   # Code from module sys_wait:
   # Code from module sys_wait-c++-tests:
   # Code from module sys_wait-tests:
   # Code from module tempname:
+  # Code from module test-framework-sh:
+  # Code from module test-framework-sh-tests:
+  # Code from module thread:
+  # Code from module thread-optim:
+  # Code from module thread-tests:
   # Code from module threadlib:
   gl_THREADLIB_EARLY
   # Code from module time:
@@ -319,12 +603,23 @@ AC_DEFUN([M4_EARLY],
   # Code from module time-tests:
   # Code from module tls:
   # Code from module tmpdir:
+  # Code from module trim:
   # Code from module unistd:
   # Code from module unistd-c++-tests:
   # Code from module unistd-safer:
   # Code from module unistd-safer-tests:
   # Code from module unistd-tests:
+  # Code from module unistr/base:
+  # Code from module unistr/u8-mbtoucr:
+  # Code from module unistr/u8-mbtoucr-tests:
+  # Code from module unistr/u8-uctomb:
+  # Code from module unistr/u8-uctomb-tests:
+  # Code from module unitypes:
+  # Code from module uniwidth/base:
+  # Code from module uniwidth/width:
+  # Code from module uniwidth/width-tests:
   # Code from module unlocked-io:
+  # Code from module unlocked-io-internal:
   # Code from module unsetenv:
   # Code from module unsetenv-tests:
   # Code from module update-copyright:
@@ -344,9 +639,9 @@ AC_DEFUN([M4_EARLY],
   # Code from module version-etc:
   # Code from module version-etc-fsf:
   # Code from module version-etc-tests:
+  # Code from module vma-iter:
   # Code from module wait-process:
   # Code from module waitpid:
-  # Code from module warn-on-use:
   # Code from module warnings:
   # Code from module wchar:
   # Code from module wchar-c++-tests:
@@ -358,18 +653,34 @@ AC_DEFUN([M4_EARLY],
   # Code from module wctype-h:
   # Code from module wctype-h-c++-tests:
   # Code from module wctype-h-tests:
+  # Code from module wcwidth:
+  # Code from module wcwidth-tests:
+  # Code from module windows-mutex:
+  # Code from module windows-once:
+  # Code from module windows-recmutex:
+  # Code from module windows-rwlock:
+  # Code from module windows-spawn:
+  # Code from module windows-spin:
+  # Code from module windows-thread:
+  # Code from module windows-tls:
+  # Code from module write:
+  # Code from module write-tests:
   # Code from module xalloc:
   # Code from module xalloc-die:
   # Code from module xalloc-die-tests:
+  # Code from module xalloc-oversized:
+  # Code from module xconcat-filename:
   # Code from module xlist:
   # Code from module xmalloca:
   # Code from module xoset:
   # Code from module xprintf:
   # Code from module xsize:
+  # Code from module xstriconv:
   # Code from module xstrndup:
   # Code from module xvasprintf:
   # Code from module xvasprintf-posix:
   # Code from module xvasprintf-tests:
+  # Code from module yield:
 ])
 
 # This macro should be invoked from ./configure.ac, in the section
@@ -386,143 +697,275 @@ AC_DEFUN([M4_INIT],
   m4_pushdef([AC_LIBSOURCES], m4_defn([M4_LIBSOURCES]))
   m4_pushdef([M4_LIBSOURCES_LIST], [])
   m4_pushdef([M4_LIBSOURCES_DIR], [])
+  m4_pushdef([GL_MACRO_PREFIX], [M4])
+  m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL_M4])
   gl_COMMON
   gl_source_base='lib'
-  # Code from module alloca-opt:
+  gl_FUNC_ACCESS
+  if test $REPLACE_ACCESS = 1; then
+    AC_LIBOBJ([access])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([access])
   gl_FUNC_ALLOCA
-  # Code from module announce-gen:
-  # Code from module arg-nonnull:
-  # Code from module assert:
   gl_ASSERT
-  # Code from module autobuild:
-  # Code from module avltree-oset:
-  # Code from module binary-io:
-  # Code from module btowc:
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_HEADERS_ONCE([pthread.h])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  AC_REQUIRE([AC_C_INLINE])
   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 c-stack:
+  gl___BUILTIN_EXPECT
   gl_C_STACK
-  # Code from module canonicalize-lgpl:
+  gl_FUNC_CALLOC_GNU
+  if test $REPLACE_CALLOC = 1; then
+    AC_LIBOBJ([calloc])
+  fi
+  gl_FUNC_CALLOC_POSIX
+  if test $REPLACE_CALLOC = 1; then
+    AC_LIBOBJ([calloc])
+  fi
+  gl_STDLIB_MODULE_INDICATOR([calloc-posix])
+  gl_FUNC_CANONICALIZE_FILENAME_MODE
+  gl_MODULE_INDICATOR([canonicalize])
+  gl_MODULE_INDICATOR_FOR_TESTS([canonicalize])
+  gl_STDLIB_MODULE_INDICATOR([canonicalize_file_name])
   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 clean-temp:
+  gl_UNISTD_MODULE_INDICATOR([chdir])
+  gl_FUNC_CHDIR_LONG
+  if test $gl_cv_have_unlimited_file_name_length = no; then
+    AC_LIBOBJ([chdir-long])
+    gl_PREREQ_CHDIR_LONG
+  fi
   AC_DEFINE([SIGNAL_SAFE_LIST], [1], [Define if lists must be signal-safe.])
-  # Code from module cloexec:
-  gl_CLOEXEC
+  gl_CLOCK_TIME
   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 closein:
-  gl_CLOSEIN
-  # Code from module closeout:
-  gl_CLOSEOUT
-  # Code from module config-h:
+  gl_FUNC_CLOSEDIR
+  if test $HAVE_CLOSEDIR = 0 || test $REPLACE_CLOSEDIR = 1; then
+    AC_LIBOBJ([closedir])
+  fi
+  gl_DIRENT_MODULE_INDICATOR([closedir])
   gl_CONFIG_H
-  # Code from module configmake:
   gl_CONFIGMAKE_PREP
-  # Code from module dirname:
-  gl_DIRNAME
+  gl_CHECK_TYPE_STRUCT_DIRENT_D_INO
+  gl_DIRENT_H
+  gl_DIRENT_H_REQUIRE_DEFAULTS
+  gl_FUNC_DIRFD
+  if test $ac_cv_func_dirfd = no && test $gl_cv_func_dirfd_macro = no \
+     || test $REPLACE_DIRFD = 1; then
+    AC_LIBOBJ([dirfd])
+    gl_PREREQ_DIRFD
+  fi
+  gl_DIRENT_MODULE_INDICATOR([dirfd])
   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 $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 execute:
   gl_EXECUTE
-  # Code from module exitfail:
-  # Code from module extensions:
-  # Code from module fatal-signal:
+  AC_REQUIRE([gl_EXTERN_INLINE])
   gl_FATAL_SIGNAL
-  # Code from module fclose:
+  gl_FUNC_FCHDIR
+  gl_UNISTD_MODULE_INDICATOR([fchdir])
   gl_FUNC_FCLOSE
+  if test $REPLACE_FCLOSE = 1; then
+    AC_LIBOBJ([fclose])
+  fi
   gl_STDIO_MODULE_INDICATOR([fclose])
-  # Code from module fcntl:
   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 fd-safer-flag:
+  gl_FCNTL_H_REQUIRE_DEFAULTS
   gl_MODULE_INDICATOR([fd-safer-flag])
-  # Code from module fdl-1.3:
-  # Code from module fflush:
+  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])
   gl_FUNC_FFLUSH
+  if test $REPLACE_FFLUSH = 1; then
+    AC_LIBOBJ([fflush])
+    gl_PREREQ_FFLUSH
+  fi
+  gl_MODULE_INDICATOR([fflush])
   gl_STDIO_MODULE_INDICATOR([fflush])
-  # Code from module filenamecat:
   gl_FILE_NAME_CONCAT
   gl_MODULE_INDICATOR([filenamecat])
-  # Code from module filenamecat-lgpl:
   gl_FILE_NAME_CONCAT_LGPL
-  # Code from module float:
+  gl_FINDPROG_IN
+  AC_C_FLEXIBLE_ARRAY_MEMBER
   gl_FLOAT_H
-  # Code from module fopen:
+  if test $REPLACE_FLOAT_LDBL = 1; then
+    AC_LIBOBJ([float])
+  fi
+  if test $REPLACE_ITOLD = 1; then
+    AC_LIBOBJ([itold])
+  fi
   gl_FUNC_FOPEN
+  if test $REPLACE_FOPEN = 1; then
+    AC_LIBOBJ([fopen])
+    gl_PREREQ_FOPEN
+  fi
   gl_STDIO_MODULE_INDICATOR([fopen])
-  # Code from module fopen-safer:
-  gl_FOPEN_SAFER
+  gl_FUNC_FOPEN_GNU
+  if test $REPLACE_FOPEN = 1; then
+    AC_LIBOBJ([fopen])
+    gl_PREREQ_FOPEN
+  fi
+  gl_MODULE_INDICATOR([fopen-gnu])
   gl_MODULE_INDICATOR([fopen-safer])
-  # Code from module fpending:
   gl_FUNC_FPENDING
-  # Code from module fpieee:
-  # Code from module fpucw:
-  # Code from module fpurge:
+  if test $gl_cv_func___fpending = no; then
+    AC_LIBOBJ([fpending])
+  fi
   gl_FUNC_FPURGE
+  if test $HAVE_FPURGE = 0 || test $REPLACE_FPURGE = 1; then
+    AC_LIBOBJ([fpurge])
+  fi
   gl_STDIO_MODULE_INDICATOR([fpurge])
-  # Code from module freadahead:
-  # Code from module freading:
+  gl_FUNC_FREADAHEAD
+  if test $ac_cv_func___freadahead = no; then
+    AC_LIBOBJ([freadahead])
+  fi
   gl_FUNC_FREADING
-  # Code from module frexp-nolibm:
+  gl_FUNC_FREE
+  if test $REPLACE_FREE = 1; then
+    AC_LIBOBJ([free])
+    gl_PREREQ_FREE
+  fi
+  gl_STDLIB_MODULE_INDICATOR([free-posix])
   gl_FUNC_FREXP_NO_LIBM
+  if test $gl_func_frexp_no_libm != yes; then
+    AC_LIBOBJ([frexp])
+  fi
   gl_MATH_MODULE_INDICATOR([frexp])
-  # Code from module frexpl-nolibm:
   gl_FUNC_FREXPL_NO_LIBM
+  if test $HAVE_DECL_FREXPL = 0 || test $gl_func_frexpl_no_libm = no; then
+    AC_LIBOBJ([frexpl])
+  fi
   gl_MATH_MODULE_INDICATOR([frexpl])
-  # Code from module fseeko:
+  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 ftello:
+  gl_FUNC_FSTAT
+  if test $REPLACE_FSTAT = 1; then
+    AC_LIBOBJ([fstat])
+    case "$host_os" in
+      mingw*)
+        AC_LIBOBJ([stat-w32])
+        ;;
+    esac
+    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_FTELL
+  if test $REPLACE_FTELL = 1; then
+    AC_LIBOBJ([ftell])
+  fi
+  gl_STDIO_MODULE_INDICATOR([ftell])
   gl_FUNC_FTELLO
+  if test $HAVE_FTELLO = 0 || test $REPLACE_FTELLO = 1; then
+    AC_LIBOBJ([ftello])
+    gl_PREREQ_FTELLO
+  fi
   gl_STDIO_MODULE_INDICATOR([ftello])
-  # Code from module gendocs:
-  # Code from module getdtablesize:
+  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])
   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 getopt-gnu:
   gl_FUNC_GETOPT_GNU
-  gl_MODULE_INDICATOR_FOR_TESTS([getopt-gnu])
-  # Code from module getopt-posix:
+  dnl Because of the way gl_FUNC_GETOPT_GNU is implemented (the gl_getopt_required
+  dnl mechanism), there is no need to do any AC_LIBOBJ or AC_SUBST here; they are
+  dnl done in the getopt-posix module.
   gl_FUNC_GETOPT_POSIX
-  # Code from module gettext-h:
+  if test $REPLACE_GETOPT = 1; then
+    AC_LIBOBJ([getopt])
+    AC_LIBOBJ([getopt1])
+    dnl Arrange for unistd.h to include getopt.h.
+    GNULIB_GL_M4_UNISTD_H_GETOPT=1
+  fi
+  AC_SUBST([GNULIB_GL_M4_UNISTD_H_GETOPT])
+  gl_UNISTD_MODULE_INDICATOR([getopt-posix])
+  gl_FUNC_GETPAGESIZE
+  if test $REPLACE_GETPAGESIZE = 1; then
+    AC_LIBOBJ([getpagesize])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([getpagesize])
+  gl_FUNC_GETPROGNAME
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  gl_FUNC_GETRANDOM
+  if test $HAVE_GETRANDOM = 0 || test $REPLACE_GETRANDOM = 1; then
+    AC_LIBOBJ([getrandom])
+  fi
+  gl_SYS_RANDOM_MODULE_INDICATOR([getrandom])
   AC_SUBST([LIBINTL])
   AC_SUBST([LTLIBINTL])
-  # Code from module gettimeofday:
-  gl_FUNC_GETTIMEOFDAY
-  gl_SYS_TIME_MODULE_INDICATOR([gettimeofday])
-  # Code from module git-version-gen:
-  # Code from module gnu-web-doc-update:
-  # Code from module gnumakefile:
   # Autoconf 2.61a.99 and earlier don't support linking a file only
   # in VPATH builds.  But since GNUmakefile is for maintainer use
   # only, it does not matter if we skip the link with older autoconf.
@@ -530,350 +973,720 @@ AC_DEFUN([M4_INIT],
   # builds, so use a shell variable to bypass this.
   GNUmakefile=GNUmakefile
   m4_if(m4_version_compare([2.61a.100],
-       m4_defn([m4_PACKAGE_VERSION])), [1], [],
+          m4_defn([m4_PACKAGE_VERSION])), [1], [],
         [AC_CONFIG_LINKS([$GNUmakefile:$GNUmakefile], [],
-       [GNUmakefile=$GNUmakefile])])
-  # Code from module gnupload:
-  # Code from module gpl-3.0:
-  # Code from module havelib:
-  # Code from module ignore-value:
-  AC_REQUIRE([AC_C_INLINE])
-  # Code from module include_next:
-  # Code from module inline:
+          [GNUmakefile=$GNUmakefile])])
+  AC_REQUIRE([gl_FUNC_SETLOCALE_NULL])
+  LIB_HARD_LOCALE="$LIB_SETLOCALE_NULL"
+  AC_SUBST([LIB_HARD_LOCALE])
+  AC_DEFUN([gl_HAVE_MODULE_HAVELIB])
+  AC_REQUIRE([gl_HOST_CPU_C_ABI])
+  AM_ICONV
+  m4_ifdef([gl_ICONV_MODULE_INDICATOR],
+    [gl_ICONV_MODULE_INDICATOR([iconv])])
+  gl_ICONV_H
+  gl_ICONV_H_REQUIRE_DEFAULTS
+  gl_FUNC_ICONV_OPEN
+  if test $REPLACE_ICONV_OPEN = 1; then
+    AC_LIBOBJ([iconv_open])
+  fi
+  if test $REPLACE_ICONV = 1; then
+    AC_LIBOBJ([iconv])
+    AC_LIBOBJ([iconv_close])
+  fi
   gl_INLINE
-  # Code from module intprops:
-  # Code from module isnand-nolibm:
+  gl_INTTYPES_INCOMPLETE
+  gl_INTTYPES_H_REQUIRE_DEFAULTS
   gl_FUNC_ISNAND_NO_LIBM
-  # Code from module isnanf-nolibm:
+  if test $gl_func_isnand_no_libm != yes; then
+    AC_LIBOBJ([isnand])
+    gl_PREREQ_ISNAND
+  fi
   gl_FUNC_ISNANF_NO_LIBM
-  # Code from module isnanl-nolibm:
+  if test $gl_func_isnanf_no_libm != yes; then
+    AC_LIBOBJ([isnanf])
+    gl_PREREQ_ISNANF
+  fi
   gl_FUNC_ISNANL_NO_LIBM
-  # Code from module langinfo:
+  if test $gl_func_isnanl_no_libm != yes; then
+    AC_LIBOBJ([isnanl])
+    gl_PREREQ_ISNANL
+  fi
+  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])
+  gl_FUNC_ISWDIGIT
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    :
+  else
+    if test $REPLACE_ISWDIGIT = 1; then
+      AC_LIBOBJ([iswdigit])
+    fi
+  fi
+  gl_WCTYPE_MODULE_INDICATOR([iswdigit])
+  gl_FUNC_ISWXDIGIT
+  if test $HAVE_ISWCNTRL = 0 || test $REPLACE_ISWCNTRL = 1; then
+    :
+  else
+    if test $REPLACE_ISWXDIGIT = 1; then
+      AC_LIBOBJ([iswxdigit])
+    fi
+  fi
+  gl_WCTYPE_MODULE_INDICATOR([iswxdigit])
   gl_LANGINFO_H
-  # Code from module libsigsegv:
-  gl_LIBSIGSEGV
-  # Code from module linkedhash-list:
-  # Code from module list:
-  gl_LIST
-  # Code from module localcharset:
+  gl_LANGINFO_H_REQUIRE_DEFAULTS
+  AC_REQUIRE([gl_LARGEFILE])
+  gl___INLINE
+  gl_LIMITS_H
   gl_LOCALCHARSET
-  LOCALCHARSET_TESTS_ENVIRONMENT="CHARSETALIASDIR=\"\$(top_builddir)/$gl_source_base\""
+  dnl For backward compatibility. Some packages still use this.
+  LOCALCHARSET_TESTS_ENVIRONMENT=
   AC_SUBST([LOCALCHARSET_TESTS_ENVIRONMENT])
-  # Code from module lock:
+  gl_LOCALE_H
+  gl_LOCALE_H_REQUIRE_DEFAULTS
+  gl_FUNC_LOCALECONV
+  if test $REPLACE_LOCALECONV = 1; then
+    AC_LIBOBJ([localeconv])
+    gl_PREREQ_LOCALECONV
+  fi
+  gl_LOCALE_MODULE_INDICATOR([localeconv])
+  gl_LOCALENAME
+  gl_LOCALE_MODULE_INDICATOR([localename])
   gl_LOCK
-  # Code from module lseek:
+  gl_MODULE_INDICATOR([lock])
   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 maintainer-makefile:
   AC_CONFIG_COMMANDS_PRE([m4_ifdef([AH_HEADER],
     [AC_SUBST([CONFIG_INCLUDE], m4_defn([AH_HEADER]))])])
-  # Code from module malloc-gnu:
+  AC_REQUIRE([AC_PROG_SED])
+  AC_REQUIRE([AC_PROG_GREP])
   gl_FUNC_MALLOC_GNU
-  gl_MODULE_INDICATOR([malloc-gnu])
-  # Code from module malloc-posix:
-  gl_FUNC_MALLOC_POSIX
+  if test $REPLACE_MALLOC = 1; then
+    AC_LIBOBJ([malloc])
+  fi
+  AC_REQUIRE([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 manywarnings:
-  # Code from module math:
   gl_MATH_H
-  # Code from module mbrtowc:
+  gl_MATH_H_REQUIRE_DEFAULTS
+  gl_MBCHAR
+  gl_MBITER
   gl_FUNC_MBRTOWC
+  if test $HAVE_MBRTOWC = 0 || test $REPLACE_MBRTOWC = 1; then
+    AC_LIBOBJ([mbrtowc])
+    if test $REPLACE_MBSTATE_T = 1; then
+      AC_LIBOBJ([lc-charset-dispatch])
+      AC_LIBOBJ([mbtowc-lock])
+      gl_PREREQ_MBTOWC_LOCK
+    fi
+    gl_PREREQ_MBRTOWC
+  fi
   gl_WCHAR_MODULE_INDICATOR([mbrtowc])
-  # 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 mbtowc:
+  gl_FUNC_MBSLEN
+  gl_STRING_MODULE_INDICATOR([mbslen])
+  gl_STRING_MODULE_INDICATOR([mbsstr])
   gl_FUNC_MBTOWC
+  if test $HAVE_MBTOWC = 0 || test $REPLACE_MBTOWC = 1; then
+    AC_LIBOBJ([mbtowc])
+    gl_PREREQ_MBTOWC
+  fi
   gl_STDLIB_MODULE_INDICATOR([mbtowc])
-  # Code from module memchr:
+  gl_MBITER
   gl_FUNC_MEMCHR
+  if test $REPLACE_MEMCHR = 1; then
+    AC_LIBOBJ([memchr])
+    gl_PREREQ_MEMCHR
+  fi
   gl_STRING_MODULE_INDICATOR([memchr])
-  # Code from module memchr2:
-  # Code from module mkdtemp:
-  gt_FUNC_MKDTEMP
+  gl_FUNC_MEMPCPY
+  if test $HAVE_MEMPCPY = 0; then
+    AC_LIBOBJ([mempcpy])
+    gl_PREREQ_MEMPCPY
+  fi
+  gl_STRING_MODULE_INDICATOR([mempcpy])
+  gl_FUNC_MEMRCHR
+  if test $ac_cv_func_memrchr = no; then
+    AC_LIBOBJ([memrchr])
+    gl_PREREQ_MEMRCHR
+  fi
+  gl_STRING_MODULE_INDICATOR([memrchr])
+  gl_MINMAX
+  gl_FUNC_MKDIR
+  if test $REPLACE_MKDIR = 1; then
+    AC_LIBOBJ([mkdir])
+  fi
+  gl_SYS_STAT_MODULE_INDICATOR([mkdir])
+  gl_FUNC_MKDTEMP
+  if test $HAVE_MKDTEMP = 0; then
+    AC_LIBOBJ([mkdtemp])
+    gl_PREREQ_MKDTEMP
+  fi
   gl_STDLIB_MODULE_INDICATOR([mkdtemp])
-  # Code from module mkstemp:
   gl_FUNC_MKSTEMP
+  if test $HAVE_MKSTEMP = 0 || test $REPLACE_MKSTEMP = 1; then
+    AC_LIBOBJ([mkstemp])
+    gl_PREREQ_MKSTEMP
+  fi
   gl_STDLIB_MODULE_INDICATOR([mkstemp])
-  # Code from module multiarch:
+  AC_REQUIRE([gl_MSVC_INVAL])
+  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+    AC_LIBOBJ([msvc-inval])
+  fi
+  AC_REQUIRE([gl_MSVC_NOTHROW])
+  if test $HAVE_MSVC_INVALID_PARAMETER_HANDLER = 1; then
+    AC_LIBOBJ([msvc-nothrow])
+  fi
+  gl_MODULE_INDICATOR([msvc-nothrow])
   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
+  if test $REPLACE_NL_LANGINFO = 1 && test $NL_LANGINFO_MTSAFE = 0; then
+    AC_LIBOBJ([nl_langinfo-lock])
+    gl_PREREQ_NL_LANGINFO_LOCK
+  fi
   gl_LANGINFO_MODULE_INDICATOR([nl_langinfo])
-  # Code from module nocrash:
-  # 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 oset:
-  gl_LIST
-  # Code from module pathmax:
+  gl_FUNC_OPENAT
+  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_PATHMAX
-  # Code from module pipe2:
+  gl_FUNC_PIPE
+  if test $HAVE_PIPE = 0; then
+    AC_LIBOBJ([pipe])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([pipe])
   gl_FUNC_PIPE2
   gl_UNISTD_MODULE_INDICATOR([pipe2])
-  # Code from module pipe2-safer:
   gl_MODULE_INDICATOR([pipe2-safer])
-  # Code from module posix_spawn-internal:
-  # Code from module posix_spawn_file_actions_addclose:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
-    AC_LIBOBJ([spawn_faction_addclose])
+    AC_LIBOBJ([spawn])
   fi
-  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
-  # Code from module posix_spawn_file_actions_adddup2:
+  gl_SPAWN_MODULE_INDICATOR([posix_spawn])
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
+    AC_LIBOBJ([spawni])
+    gl_PREREQ_POSIX_SPAWN_INTERNAL
+  fi
+  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $HAVE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 0 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCHDIR = 1; then
+    AC_LIBOBJ([spawn_faction_addchdir])
+  fi
+  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addchdir])
+  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDCLOSE = 1; then
+    AC_LIBOBJ([spawn_faction_addclose])
+  fi
+  gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addclose])
+  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDDUP2 = 1; then
     AC_LIBOBJ([spawn_faction_adddup2])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_adddup2])
-  # Code from module posix_spawn_file_actions_addopen:
-  gl_POSIX_SPAWN
-  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
+  gl_FUNC_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1 || test $REPLACE_POSIX_SPAWN_FILE_ACTIONS_ADDOPEN = 1; then
     AC_LIBOBJ([spawn_faction_addopen])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_addopen])
-  # Code from module posix_spawn_file_actions_destroy:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_destroy])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_destroy])
-  # Code from module posix_spawn_file_actions_init:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawn_faction_init])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawn_file_actions_init])
-  # Code from module posix_spawnattr_destroy:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_destroy])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_destroy])
-  # Code from module posix_spawnattr_init:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_init])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_init])
-  # Code from module posix_spawnattr_setflags:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnattr_setflags])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setflags])
-  # Code from module posix_spawnattr_setsigmask:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
+    AC_LIBOBJ([spawnattr_setpgroup])
+  fi
+  gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setpgroup])
+  gl_POSIX_SPAWN
+  if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
     AC_LIBOBJ([spawnattr_setsigmask])
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnattr_setsigmask])
-  # Code from module posix_spawnp:
   gl_POSIX_SPAWN
   if test $HAVE_POSIX_SPAWN = 0 || test $REPLACE_POSIX_SPAWN = 1; then
-    gl_REPLACE_SPAWN_H
     AC_LIBOBJ([spawnp])
-    gl_POSIX_SPAWN_INTERNAL
   fi
   gl_SPAWN_MODULE_INDICATOR([posix_spawnp])
-  # Code from module printf-frexp:
   gl_FUNC_PRINTF_FREXP
-  # Code from module printf-frexpl:
   gl_FUNC_PRINTF_FREXPL
-  # Code from module printf-safe:
   m4_divert_text([INIT_PREPARE], [gl_printf_safe=yes])
-  # 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 quotearg:
+  m4_ifdef([AM_XGETTEXT_OPTION],
+    [AM_][XGETTEXT_OPTION([--keyword='proper_name:1,\"This is a proper name. See the gettext manual, section Names.\"'])
+     AM_][XGETTEXT_OPTION([--keyword='proper_name_utf8:1,\"This is a proper name. See the gettext manual, section Names.\"'])])
   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_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 regex:
+  gl_FUNC_REALLOC_GNU
+  if test $REPLACE_REALLOC = 1; then
+    AC_LIBOBJ([realloc])
+  fi
+  gl_FUNC_REALLOC_POSIX
+  if test $REPLACE_REALLOC = 1; then
+    AC_LIBOBJ([realloc])
+  fi
+  gl_STDLIB_MODULE_INDICATOR([realloc-posix])
+  gl_FUNC_REALLOCARRAY
+  if test $HAVE_REALLOCARRAY = 0 || test $REPLACE_REALLOCARRAY = 1; then
+    AC_LIBOBJ([reallocarray])
+    gl_PREREQ_REALLOCARRAY
+  fi
+  gl_MODULE_INDICATOR([reallocarray])
+  gl_STDLIB_MODULE_INDICATOR([reallocarray])
   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 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 same-inode:
-  # Code from module sched:
+  gl_SAVE_CWD
   gl_SCHED_H
-  # Code from module sigaction:
+  gl_SCHED_H_REQUIRE_DEFAULTS
+  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])
+  gl_FUNC_SETLOCALE
+  if test $REPLACE_SETLOCALE = 1; then
+    AC_LIBOBJ([setlocale])
+    gl_PREREQ_SETLOCALE
+  fi
+  gl_LOCALE_MODULE_INDICATOR([setlocale])
+  gl_FUNC_SETLOCALE_NULL
+  if test $SETLOCALE_NULL_ALL_MTSAFE = 0 || test $SETLOCALE_NULL_ONE_MTSAFE = 0; then
+    AC_LIBOBJ([setlocale-lock])
+    gl_PREREQ_SETLOCALE_LOCK
+  fi
+  gl_LOCALE_MODULE_INDICATOR([setlocale_null])
+  gl_SH_FILENAME
   gl_SIGACTION
+  if test $HAVE_SIGACTION = 0; then
+    AC_LIBOBJ([sigaction])
+    gl_PREREQ_SIGACTION
+  fi
   gl_SIGNAL_MODULE_INDICATOR([sigaction])
-  # Code from module signal:
   gl_SIGNAL_H
-  # Code from module signbit:
+  gl_SIGNAL_H_REQUIRE_DEFAULTS
   gl_SIGNBIT
+  if test $REPLACE_SIGNBIT = 1; then
+    AC_LIBOBJ([signbitf])
+    AC_LIBOBJ([signbitd])
+    AC_LIBOBJ([signbitl])
+  fi
   gl_MATH_MODULE_INDICATOR([signbit])
-  # Code from module sigprocmask:
+  gl_SIGNAL_SIGPIPE
+  dnl Define the C macro GNULIB_SIGPIPE to 1.
+  gl_MODULE_INDICATOR([sigpipe])
+  dnl Define the substituted variable GNULIB_SIGNAL_H_SIGPIPE to 1.
+  gl_SIGNAL_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_SIGNAL_H_SIGPIPE], [1])
+  dnl Define the substituted variable GNULIB_STDIO_H_SIGPIPE to 1.
+  gl_STDIO_H_REQUIRE_DEFAULTS
+  AC_REQUIRE([gl_ASM_SYMBOL_PREFIX])
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_STDIO_H_SIGPIPE], [1])
+  dnl Define the substituted variable GNULIB_UNISTD_H_SIGPIPE to 1.
+  gl_UNISTD_H_REQUIRE_DEFAULTS
+  gl_MODULE_INDICATOR_INIT_VARIABLE([GNULIB_UNISTD_H_SIGPIPE], [1])
   gl_SIGNALBLOCKING
+  if test $HAVE_POSIX_SIGNALBLOCKING = 0; then
+    AC_LIBOBJ([sigprocmask])
+    gl_PREREQ_SIGPROCMASK
+  fi
   gl_SIGNAL_MODULE_INDICATOR([sigprocmask])
-  # Code from module size_max:
+  AC_ARG_WITH([libsigsegv],
+    [AS_HELP_STRING([--with-libsigsegv],
+       [use the GNU libsigsegv library, when present, instead of the gnulib module 'sigsegv'])])
+  SIGSEGV_H=sigsegv.h
+  if test "$with_libsigsegv" = yes; then
+    gl_LIBSIGSEGV
+    if test "$gl_cv_lib_sigsegv" = yes; then
+      SIGSEGV_H=
+    fi
+  fi
+  AC_SUBST([SIGSEGV_H])
+  AM_CONDITIONAL([GL_GENERATE_SIGSEGV_H], [test -n "$SIGSEGV_H"])
+  if test -n "$SIGSEGV_H"; then
+    dnl Persuade glibc <sys/ucontext.h> to declare macros designating register
+    dnl indices: REG_RSP on x86_64, REG_ESP on i386.
+    dnl Persuade Solaris OpenIndiana <ucontext.h> to include <sys/regset.h>,
+    dnl which declares macros designating register indices, such as ESP on i386.
+    dnl Persuade Solaris OpenIndiana <unistd.h> to declare mincore().
+    AC_REQUIRE([gl_USE_SYSTEM_EXTENSIONS])
+    AC_REQUIRE([AC_CANONICAL_HOST])
+    case "$host_os" in
+      solaris2.11)
+        AC_DEFINE([SOLARIS11], [1], [Define on Solaris 11 and its derivates.])
+        ;;
+    esac
+    gl_FUNC_MMAP_ANON
+    dnl Stack direction.
+    SV_STACK_DIRECTION
+    dnl Catching stack overflow requires an alternate signal stack.
+    dnl The old "install a guard page" trick would be unreliable, because
+    dnl we don't know where exactly to place the guard page.
+    SV_SIGALTSTACK
+    AC_CHECK_FUNCS_ONCE([getrlimit])
+  fi
   gl_SIZE_MAX
-  # Code from module snprintf:
   gl_FUNC_SNPRINTF
   gl_STDIO_MODULE_INDICATOR([snprintf])
   gl_MODULE_INDICATOR([snprintf])
-  # Code from module spawn:
   gl_SPAWN_H
-  # Code from module spawn-pipe:
+  gl_SPAWN_H_REQUIRE_DEFAULTS
   gl_SPAWN_PIPE
-  # Code from module ssize_t:
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    os2*)
+      AC_LIBOBJ([os2-spawn])
+      ;;
+  esac
   gt_TYPE_SSIZE_T
-  # Code from module stat:
   gl_FUNC_STAT
+  if test $REPLACE_STAT = 1; then
+    AC_LIBOBJ([stat])
+    case "$host_os" in
+      mingw*)
+        AC_LIBOBJ([stat-w32])
+        ;;
+    esac
+    gl_PREREQ_STAT
+  fi
   gl_SYS_STAT_MODULE_INDICATOR([stat])
-  # Code from module stdarg:
+  gl_STAT_TIME
+  gl_STAT_BIRTHTIME
+  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_STDDEF_H_REQUIRE_DEFAULTS
   gl_STDINT_H
-  # Code from module stdio:
   gl_STDIO_H
-  # Code from module stdlib:
+  gl_STDIO_H_REQUIRE_DEFAULTS
+  dnl No need to create extra modules for these functions. Everyone who uses
+  dnl <stdio.h> likely needs them.
+  gl_STDIO_MODULE_INDICATOR([fscanf])
+  gl_MODULE_INDICATOR([fscanf])
+  gl_STDIO_MODULE_INDICATOR([scanf])
+  gl_MODULE_INDICATOR([scanf])
+  gl_STDIO_MODULE_INDICATOR([fgetc])
+  gl_STDIO_MODULE_INDICATOR([getc])
+  gl_STDIO_MODULE_INDICATOR([getchar])
+  gl_STDIO_MODULE_INDICATOR([fgets])
+  gl_STDIO_MODULE_INDICATOR([fread])
+  dnl No need to create extra modules for these functions. Everyone who uses
+  dnl <stdio.h> likely needs them.
+  gl_STDIO_MODULE_INDICATOR([fprintf])
+  gl_STDIO_MODULE_INDICATOR([printf])
+  gl_STDIO_MODULE_INDICATOR([vfprintf])
+  gl_STDIO_MODULE_INDICATOR([vprintf])
+  gl_STDIO_MODULE_INDICATOR([fputc])
+  gl_STDIO_MODULE_INDICATOR([putc])
+  gl_STDIO_MODULE_INDICATOR([putchar])
+  gl_STDIO_MODULE_INDICATOR([fputs])
+  gl_STDIO_MODULE_INDICATOR([puts])
+  gl_STDIO_MODULE_INDICATOR([fwrite])
   gl_STDLIB_H
-  # Code from module stdlib-safer:
-  gl_STDLIB_SAFER
-  # Code from module strchrnul:
+  gl_STDLIB_H_REQUIRE_DEFAULTS
+  gl_FUNC_STPCPY
+  if test $HAVE_STPCPY = 0; then
+    AC_LIBOBJ([stpcpy])
+    gl_PREREQ_STPCPY
+  fi
+  gl_STRING_MODULE_INDICATOR([stpcpy])
   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 streq:
-  # Code from module strerror:
+  gl_FUNC_STRDUP_POSIX
+  if test $REPLACE_STRDUP = 1; then
+    AC_LIBOBJ([strdup])
+    gl_PREREQ_STRDUP
+  fi
+  gl_STRING_MODULE_INDICATOR([strdup])
   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:
-  gl_HEADER_STRING_H
-  # Code from module strndup:
+  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
+  if test $gl_cond_libtool = false; then
+    gl_ltlibdeps="$gl_ltlibdeps $LTLIBICONV"
+    gl_libdeps="$gl_libdeps $LIBICONV"
+  fi
+  gl_STRING_H
+  gl_STRING_H_REQUIRE_DEFAULTS
   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 strsignal:
   gl_FUNC_STRSIGNAL
+  if test $HAVE_STRSIGNAL = 0 || test $REPLACE_STRSIGNAL = 1; then
+    AC_LIBOBJ([strsignal])
+    gl_PREREQ_STRSIGNAL
+  fi
   gl_STRING_MODULE_INDICATOR([strsignal])
-  # Code from module strstr:
   gl_FUNC_STRSTR
-  # Code from module strstr-simple:
+  if test $REPLACE_STRSTR = 1; then
+    AC_LIBOBJ([strstr])
+  fi
   gl_FUNC_STRSTR_SIMPLE
+  if test $REPLACE_STRSTR = 1; then
+    AC_LIBOBJ([strstr])
+  fi
   gl_STRING_MODULE_INDICATOR([strstr])
-  # Code from module strtod:
   gl_FUNC_STRTOD
+  if test $HAVE_STRTOD = 0 || test $REPLACE_STRTOD = 1; then
+    AC_LIBOBJ([strtod])
+    gl_PREREQ_STRTOD
+  fi
   gl_STDLIB_MODULE_INDICATOR([strtod])
-  # Code from module strtol:
-  gl_FUNC_STRTOL
-  # Code from module sys_stat:
-  gl_HEADER_SYS_STAT_H
+  gl_SYS_RANDOM_H
+  gl_SYS_RANDOM_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
-  # Code from module sys_time:
-  gl_HEADER_SYS_TIME_H
+  gl_SYS_STAT_H
+  gl_SYS_STAT_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_SYS_TYPES_H
+  gl_SYS_TYPES_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
-  # Code from module sys_wait:
   gl_SYS_WAIT_H
+  gl_SYS_WAIT_H_REQUIRE_DEFAULTS
   AC_PROG_MKDIR_P
-  # Code from module tempname:
   gl_FUNC_GEN_TEMPNAME
-  # Code from module threadlib:
-  gl_THREADLIB
-  # Code from module time:
-  gl_HEADER_TIME_H
-  # Code from module tls:
+  gl_MODULE_INDICATOR([tempname])
+  AC_CHECK_HEADERS([sys/single_threaded.h])
+  AC_REQUIRE([gl_THREADLIB])
+  gl_TIME_H
+  gl_TIME_H_REQUIRE_DEFAULTS
   gl_TLS
-  # Code from module tmpdir:
   gt_TMPDIR
-  # Code from module unistd:
   gl_UNISTD_H
-  # Code from module unistd-safer:
+  gl_UNISTD_H_REQUIRE_DEFAULTS
   gl_UNISTD_SAFER
-  # Code from module unlocked-io:
+  gl_LIBUNISTRING_LIBHEADER([0.9.11], [unistr.h])
+  gl_MODULE_INDICATOR([unistr/u8-mbtoucr])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-mbtoucr])
+  gl_MODULE_INDICATOR([unistr/u8-uctomb])
+  gl_LIBUNISTRING_MODULE([0.9], [unistr/u8-uctomb])
+  gl_LIBUNISTRING_LIBHEADER([0.9.11], [unitypes.h])
+  gl_LIBUNISTRING_LIBHEADER([0.9.11], [uniwidth.h])
+  gl_LIBUNISTRING_MODULE([0.9.8], [uniwidth/width])
+  AC_DEFINE([GNULIB_STDIO_SINGLE_THREAD], [1],
+    [Define to 1 if you want the FILE stream functions getc, putc, etc.
+     to use unlocked I/O if available, throughout the package.
+     Unlocked I/O can improve performance, sometimes dramatically.
+     But unlocked I/O is safe only in single-threaded programs,
+     as well as in multithreaded programs for which you can guarantee that
+     every FILE stream, including stdin, stdout, stderr, is used only
+     in a single thread.])
+  AC_DEFINE([USE_UNLOCKED_IO], [GNULIB_STDIO_SINGLE_THREAD],
+    [An alias of GNULIB_STDIO_SINGLE_THREAD.])
   gl_FUNC_GLIBC_UNLOCKED_IO
-  # Code from module update-copyright:
-  # Code from module useless-if-before-free:
-  # Code from module vasnprintf:
+  AC_REQUIRE([AC_C_RESTRICT])
   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 vasprintf-posix:
   gl_FUNC_VASPRINTF_POSIX
-  # Code from module vc-list-files:
-  # Code from module verify:
-  # Code from module verror:
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=verror:3:c-format])
      AM_][XGETTEXT_OPTION([--flag=verror_at_line:5:c-format])])
-  # Code from module version-etc:
   gl_VERSION_ETC
-  # Code from module version-etc-fsf:
-  # Code from module wait-process:
   gl_WAIT_PROCESS
-  # Code from module waitpid:
   gl_FUNC_WAITPID
+  if test $HAVE_WAITPID = 0; then
+    AC_LIBOBJ([waitpid])
+  fi
   gl_SYS_WAIT_MODULE_INDICATOR([waitpid])
-  # Code from module warn-on-use:
-  # Code from module warnings:
-  AC_SUBST([WARN_CFLAGS])
-  # Code from module wchar:
   gl_WCHAR_H
-  # Code from module wcrtomb:
+  gl_WCHAR_H_REQUIRE_DEFAULTS
   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 xalloc:
+  gl_WCTYPE_H_REQUIRE_DEFAULTS
+  gl_FUNC_WCWIDTH
+  if test $HAVE_WCWIDTH = 0 || test $REPLACE_WCWIDTH = 1; then
+    AC_LIBOBJ([wcwidth])
+    gl_PREREQ_WCWIDTH
+  fi
+  gl_WCHAR_MODULE_INDICATOR([wcwidth])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-mutex])
+      ;;
+  esac
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-once])
+      ;;
+  esac
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-recmutex])
+      ;;
+  esac
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-rwlock])
+      ;;
+  esac
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-spawn])
+      ;;
+  esac
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-spin])
+      ;;
+  esac
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-tls])
+      ;;
+  esac
   gl_XALLOC
-  # Code from module xalloc-die:
-  # Code from module xlist:
-  gl_LIST
-  # Code from module xmalloca:
-  # Code from module xoset:
-  gl_LIST
-  # Code from module xprintf:
+  gl_MODULE_INDICATOR([xalloc])
+  gl_MODULE_INDICATOR([xalloc-die])
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=xprintf:1:c-format])
      AM_][XGETTEXT_OPTION([--flag=xvprintf:1:c-format])
      AM_][XGETTEXT_OPTION([--flag=xfprintf:2:c-format])
      AM_][XGETTEXT_OPTION([--flag=xvfprintf:2:c-format])])
-  # Code from module xsize:
   gl_XSIZE
-  # Code from module xstrndup:
   gl_XSTRNDUP
-  # Code from module xvasprintf:
   gl_XVASPRINTF
   m4_ifdef([AM_XGETTEXT_OPTION],
     [AM_][XGETTEXT_OPTION([--flag=xasprintf:1:c-format])])
-  # Code from module xvasprintf-posix:
   # End of code from modules
   m4_ifval(M4_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([M4_LIBSOURCES_DIR])[ ||
@@ -886,6 +1699,8 @@ AC_DEFUN([M4_INIT],
       m4_if(m4_sysval, [0], [],
         [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
   ])
+  m4_popdef([GL_MODULE_INDICATOR_PREFIX])
+  m4_popdef([GL_MACRO_PREFIX])
   m4_popdef([M4_LIBSOURCES_DIR])
   m4_popdef([M4_LIBSOURCES_LIST])
   m4_popdef([AC_LIBSOURCES])
@@ -912,6 +1727,8 @@ AC_DEFUN([M4_INIT],
   m4_pushdef([AC_LIBSOURCES], m4_defn([M4tests_LIBSOURCES]))
   m4_pushdef([M4tests_LIBSOURCES_LIST], [])
   m4_pushdef([M4tests_LIBSOURCES_DIR], [])
+  m4_pushdef([GL_MACRO_PREFIX], [M4tests])
+  m4_pushdef([GL_MODULE_INDICATOR_PREFIX], [GL_M4])
   gl_COMMON
   gl_source_base='tests'
 changequote(,)dnl
@@ -920,32 +1737,130 @@ changequote([, ])dnl
   AC_SUBST([M4tests_WITNESS])
   gl_module_indicator_condition=$M4tests_WITNESS
   m4_pushdef([gl_MODULE_INDICATOR_CONDITION], [$gl_module_indicator_condition])
-  gl_PROG_ANSI_CXX([CXX], [ANSICXX])
+  AC_REQUIRE([gl_SYS_SOCKET_H])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_LIBOBJ([accept])
+  fi
+  gl_SYS_SOCKET_MODULE_INDICATOR([accept])
+  AC_CHECK_FUNCS_ONCE([geteuid])
+  gl_ARPA_INET_H
+  gl_ARPA_INET_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  AC_CHECK_HEADERS_ONCE([semaphore.h])
+  AC_CHECK_DECLS_ONCE([alarm])
+  AC_REQUIRE([gl_SEMAPHORE])
+  AC_REQUIRE([gl_SYS_SOCKET_H])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_LIBOBJ([bind])
+  fi
+  gl_SYS_SOCKET_MODULE_INDICATOR([bind])
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
   gt_LOCALE_FR
   gt_LOCALE_TR_UTF8
+  AC_REQUIRE([gl_SYS_SOCKET_H])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_LIBOBJ([connect])
+  fi
+  gl_SYS_SOCKET_MODULE_INDICATOR([connect])
+  gl_FUNC_CREAT
+  if test $REPLACE_CREAT = 1; then
+    AC_LIBOBJ([creat])
+  fi
+  gl_FCNTL_MODULE_INDICATOR([creat])
+  gl_CTYPE_H
+  gl_CTYPE_H_REQUIRE_DEFAULTS
+  dnl Test for Linux system call close_range(), declared in <unistd.h>.
+  AC_CHECK_FUNCS([close_range])
+  gl_FUNC_EXPLICIT_BZERO
+  if test $HAVE_EXPLICIT_BZERO = 0; then
+    AC_LIBOBJ([explicit_bzero])
+    gl_PREREQ_EXPLICIT_BZERO
+  fi
+  gl_STRING_MODULE_INDICATOR([explicit_bzero])
+  gl_FUNC_FDOPEN
+  if test $REPLACE_FDOPEN = 1; then
+    AC_LIBOBJ([fdopen])
+    gl_PREREQ_FDOPEN
+  fi
+  gl_STDIO_MODULE_INDICATOR([fdopen])
+  gl_FINDPROG
+  gl_FUNC_FREOPEN
+  if test $REPLACE_FREOPEN = 1; then
+    AC_LIBOBJ([freopen])
+    gl_PREREQ_FREOPEN
+  fi
+  gl_STDIO_MODULE_INDICATOR([freopen])
   gl_FUNC_UNGETC_WORKS
-  gl_FUNC_FTELL
-  gl_STDIO_MODULE_INDICATOR([ftell])
   gl_FUNC_UNGETC_WORKS
   gl_FUNC_UNGETC_WORKS
-  gl_FUNC_GETPAGESIZE
-  gl_UNISTD_MODULE_INDICATOR([getpagesize])
+  gl_FUNC_UNGETC_WORKS
+  gl_FUNC_FTRUNCATE
+  if test $HAVE_FTRUNCATE = 0 || test $REPLACE_FTRUNCATE = 1; then
+    AC_LIBOBJ([ftruncate])
+    gl_PREREQ_FTRUNCATE
+  fi
+  gl_UNISTD_MODULE_INDICATOR([ftruncate])
+  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])
+  gl_MUSL_LIBC
+  dnl Distinguish OpenBSD >= 6.2 from OpenBSD < 6.2.
+  AC_CHECK_FUNCS_ONCE([duplocale])
+  gl_FUNC_INET_PTON
+  if test $HAVE_INET_PTON = 0 || test $REPLACE_INET_PTON = 1; then
+    AC_LIBOBJ([inet_pton])
+    gl_PREREQ_INET_PTON
+  fi
+  gl_ARPA_INET_MODULE_INDICATOR([inet_pton])
+  AC_C_BIGENDIAN
+  gl_INTTOSTR
+  gl_INTTYPES_H
+  gl_FUNC_IOCTL
+  if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then
+    AC_LIBOBJ([ioctl])
+  fi
+  gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
+  gl_FUNC_ISBLANK
+  if test $HAVE_ISBLANK = 0; then
+    AC_LIBOBJ([isblank])
+  fi
+  gl_MODULE_INDICATOR([isblank])
+  gl_CTYPE_MODULE_INDICATOR([isblank])
   gl_DOUBLE_EXPONENT_LOCATION
   gl_FLOAT_EXPONENT_LOCATION
   gl_LONG_DOUBLE_EXPONENT_LOCATION
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
+  gt_LOCALE_FR
+  gt_LOCALE_FR_UTF8
+  gt_LOCALE_JA
+  gt_LOCALE_ZH_CN
+  gt_LOCALE_FR
+  gt_LOCALE_FR_UTF8
+  gt_LOCALE_JA
+  gt_LOCALE_ZH_CN
   gl_FUNC_LINK
+  if test $HAVE_LINK = 0 || test $REPLACE_LINK = 1; then
+    AC_LIBOBJ([link])
+  fi
   gl_UNISTD_MODULE_INDICATOR([link])
-  gl_LOCALE_H
+  AC_REQUIRE([gl_SYS_SOCKET_H])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_LIBOBJ([listen])
+  fi
+  gl_SYS_SOCKET_MODULE_INDICATOR([listen])
   AC_CHECK_FUNCS_ONCE([newlocale])
-  gl_LOCALENAME
   AC_CHECK_FUNCS_ONCE([newlocale])
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
   gt_LOCALE_JA
   gt_LOCALE_ZH_CN
   gt_LOCALE_FR_UTF8
+  gt_LOCALE_FR_UTF8
+  gt_LOCALE_ZH_CN
   dnl Check for prerequisites for memory fence checks.
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
@@ -953,37 +1868,117 @@ changequote([, ])dnl
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_FUNC_NANOSLEEP
+  if test $HAVE_NANOSLEEP = 0 || test $REPLACE_NANOSLEEP = 1; then
+    AC_LIBOBJ([nanosleep])
+    gl_PREREQ_NANOSLEEP
+  fi
+  gl_TIME_MODULE_INDICATOR([nanosleep])
+  AC_CHECK_DECLS_ONCE([alarm])
+  gl_HEADER_NETINET_IN
+  AC_PROG_MKDIR_P
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
-  AC_EGREP_CPP([notposix], [[
-  #if defined _MSC_VER || defined __MINGW32__
-    notposix
-  #endif
-    ]],
-    [posix_spawn_ported=no],
-    [posix_spawn_ported=yes])
-  AM_CONDITIONAL([POSIX_SPAWN_PORTED], [test $posix_spawn_ported = yes])
+  gl_FUNC_PERROR
+  if test $REPLACE_PERROR = 1; then
+    AC_LIBOBJ([perror])
+  fi
+  gl_STRING_MODULE_INDICATOR([perror])
+  gl_PTHREAD_H
+  gl_PTHREAD_H_REQUIRE_DEFAULTS
+  gl_PTHREAD_THREAD
+  if test $HAVE_PTHREAD_CREATE = 0 || test $REPLACE_PTHREAD_CREATE = 1; then
+    AC_LIBOBJ([pthread-thread])
+  fi
+  gl_PTHREAD_MODULE_INDICATOR([pthread-thread])
+  gl_FUNC_PTHREAD_SIGMASK
+  if test $HAVE_PTHREAD_SIGMASK = 0 || test $REPLACE_PTHREAD_SIGMASK = 1; then
+    AC_LIBOBJ([pthread_sigmask])
+    gl_PREREQ_PTHREAD_SIGMASK
+  fi
+  gl_SIGNAL_MODULE_INDICATOR([pthread_sigmask])
   gl_FUNC_PUTENV
+  if test $REPLACE_PUTENV = 1; then
+    AC_LIBOBJ([putenv])
+    gl_PREREQ_PUTENV
+  fi
   gl_STDLIB_MODULE_INDICATOR([putenv])
   dnl Check for prerequisites for memory fence checks.
+  dnl FIXME: zerosize-ptr.h requires these: make a module for it
+  gl_FUNC_MMAP_ANON
+  AC_CHECK_HEADERS_ONCE([sys/mman.h])
+  AC_CHECK_FUNCS_ONCE([mprotect])
+  dnl Check for prerequisites for memory fence checks.
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
+  gl_PREREQ_READ_FILE
+  gl_FUNC_SCHED_YIELD
+  if test $HAVE_SCHED_YIELD = 0 || test $REPLACE_SCHED_YIELD = 1; then
+    AC_LIBOBJ([sched_yield])
+  fi
+  gl_SCHED_MODULE_INDICATOR([sched_yield])
+  gl_FUNC_SELECT
+  if test $REPLACE_SELECT = 1; then
+    AC_LIBOBJ([select])
+  fi
+  gl_SYS_SELECT_MODULE_INDICATOR([select])
+  AC_CHECK_HEADERS_ONCE([sys/wait.h])
   gl_FUNC_SETENV
+  if test $HAVE_SETENV = 0 || test $REPLACE_SETENV = 1; then
+    AC_LIBOBJ([setenv])
+  fi
   gl_STDLIB_MODULE_INDICATOR([setenv])
-  gl_FUNC_SETLOCALE
-  gl_LOCALE_MODULE_INDICATOR([setlocale])
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
   gt_LOCALE_JA
   gt_LOCALE_ZH_CN
+  AC_REQUIRE([gl_SYS_SOCKET_H])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_LIBOBJ([setsockopt])
+  fi
+  gl_SYS_SOCKET_MODULE_INDICATOR([setsockopt])
   AC_REQUIRE([gl_FLOAT_EXPONENT_LOCATION])
   AC_REQUIRE([gl_DOUBLE_EXPONENT_LOCATION])
   AC_REQUIRE([gl_LONG_DOUBLE_EXPONENT_LOCATION])
-  gt_TYPE_WCHAR_T
-  gt_TYPE_WINT_T
-  gl_FUNC_STRDUP_POSIX
-  gl_STRING_MODULE_INDICATOR([strdup])
+  AC_CHECK_FUNCS_ONCE([setrlimit])
+  gl_FUNC_MMAP_ANON
+  gl_FUNC_SLEEP
+  if test $HAVE_SLEEP = 0 || test $REPLACE_SLEEP = 1; then
+    AC_LIBOBJ([sleep])
+  fi
+  gl_UNISTD_MODULE_INDICATOR([sleep])
+  AC_CHECK_DECLS_ONCE([alarm])
+  AC_REQUIRE([gl_SYS_SOCKET_H])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    AC_LIBOBJ([socket])
+  fi
+  # When this module is used, sockets may actually occur as file descriptors,
+  # hence it is worth warning if the modules 'close' and 'ioctl' are not used.
+  m4_ifdef([gl_UNISTD_H_DEFAULTS], [gl_UNISTD_H_REQUIRE_DEFAULTS])
+  m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [gl_SYS_IOCTL_H_REQUIRE_DEFAULTS])
+  AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2])
+  if test "$ac_cv_header_winsock2_h" = yes; then
+    UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
+    SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
+  fi
+  gl_SYS_SOCKET_MODULE_INDICATOR([socket])
+  AC_REQUIRE([gl_SOCKETLIB])
+  AC_REQUIRE([gl_SOCKETS])
+  gl_TYPE_SOCKLEN_T
+  AC_REQUIRE([gt_TYPE_WCHAR_T])
+  AC_REQUIRE([gt_TYPE_WINT_T])
+  gl_FUNC_STRERROR_R
+  if test $HAVE_DECL_STRERROR_R = 0 || test $REPLACE_STRERROR_R = 1; then
+    AC_LIBOBJ([strerror_r])
+    gl_PREREQ_STRERROR_R
+  fi
+  gl_STRING_MODULE_INDICATOR([strerror_r])
+  dnl For the modules argp, error.
+  gl_MODULE_INDICATOR([strerror_r-posix])
   dnl Check for prerequisites for memory fence checks.
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
@@ -992,22 +1987,73 @@ changequote([, ])dnl
   gl_FUNC_MMAP_ANON
   AC_CHECK_HEADERS_ONCE([sys/mman.h])
   AC_CHECK_FUNCS_ONCE([mprotect])
+  gt_LOCALE_FR
+  gt_LOCALE_FR_UTF8
   gl_FUNC_SYMLINK
+  if test $HAVE_SYMLINK = 0 || test $REPLACE_SYMLINK = 1; then
+    AC_LIBOBJ([symlink])
+  fi
   gl_UNISTD_MODULE_INDICATOR([symlink])
+  gl_SYS_IOCTL_H
+  gl_SYS_IOCTL_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_SYS_SELECT_H
+  gl_SYS_SELECT_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_SYS_SOCKET_H
+  gl_SYS_SOCKET_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  AC_CHECK_FUNCS_ONCE([shutdown])
+  gl_SYS_TIME_H
+  gl_SYS_TIME_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_SYS_UIO_H
+  gl_SYS_UIO_H_REQUIRE_DEFAULTS
+  AC_PROG_MKDIR_P
+  gl_THREAD
   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])
   abs_aux_dir=`cd "$ac_aux_dir"; pwd`
   AC_SUBST([abs_aux_dir])
+  AC_REQUIRE([gl_LONG_DOUBLE_VS_DOUBLE])
   abs_aux_dir=`cd "$ac_aux_dir"; pwd`
   AC_SUBST([abs_aux_dir])
+  gl_FUNC_MMAP_ANON
+  AC_REQUIRE([AC_C_INLINE])
+  AC_CHECK_FUNCS_ONCE([mquery pstat_getprocvm])
   gt_LOCALE_FR
   gt_LOCALE_FR_UTF8
   gt_LOCALE_JA
   gt_LOCALE_ZH_CN
   gl_FUNC_WCTOB
+  if test $HAVE_WCTOB = 0 || test $REPLACE_WCTOB = 1; then
+    AC_LIBOBJ([wctob])
+    gl_PREREQ_WCTOB
+  fi
   gl_WCHAR_MODULE_INDICATOR([wctob])
   gl_FUNC_WCTOMB
+  if test $REPLACE_WCTOMB = 1; then
+    AC_LIBOBJ([wctomb])
+    gl_PREREQ_WCTOMB
+  fi
   gl_STDLIB_MODULE_INDICATOR([wctomb])
+  AC_REQUIRE([AC_CANONICAL_HOST])
+  case "$host_os" in
+    mingw*)
+      AC_LIBOBJ([windows-thread])
+      ;;
+  esac
+  gl_FUNC_WRITE
+  if test $REPLACE_WRITE = 1; then
+    AC_LIBOBJ([write])
+    gl_PREREQ_WRITE
+  fi
+  gl_UNISTD_MODULE_INDICATOR([write])
+  AC_REQUIRE([gl_YIELD])
   m4_popdef([gl_MODULE_INDICATOR_CONDITION])
   m4_ifval(M4tests_LIBSOURCES_LIST, [
     m4_syscmd([test ! -d ]m4_defn([M4tests_LIBSOURCES_DIR])[ ||
@@ -1020,6 +2066,8 @@ changequote([, ])dnl
       m4_if(m4_sysval, [0], [],
         [AC_FATAL([expected source file, required through AC_LIBSOURCES, not found])])
   ])
+  m4_popdef([GL_MODULE_INDICATOR_PREFIX])
+  m4_popdef([GL_MACRO_PREFIX])
   m4_popdef([M4tests_LIBSOURCES_DIR])
   m4_popdef([M4tests_LIBSOURCES_LIST])
   m4_popdef([AC_LIBSOURCES])
@@ -1105,53 +2153,85 @@ AC_DEFUN([M4tests_LIBSOURCES], [
 # gnulib-tool and may be removed by future gnulib-tool invocations.
 AC_DEFUN([M4_FILE_LIST], [
   build-aux/announce-gen
-  build-aux/arg-nonnull.h
-  build-aux/c++defs.h
   build-aux/config.rpath
+  build-aux/do-release-commit-and-tag
   build-aux/gendocs.sh
   build-aux/git-version-gen
+  build-aux/gitlog-to-changelog
   build-aux/gnu-web-doc-update
   build-aux/gnupload
   build-aux/update-copyright
   build-aux/useless-if-before-free
   build-aux/vc-list-files
-  build-aux/warn-on-use.h
   doc/fdl-1.3.texi
   doc/gendocs_template
+  doc/gendocs_template_min
   doc/gpl-3.0.texi
+  lib/_Noreturn.h
+  lib/access.c
+  lib/alignof.h
   lib/alloca.in.h
+  lib/arg-nonnull.h
   lib/asnprintf.c
   lib/asprintf.c
+  lib/assure.h
+  lib/asyncsafe-spin.c
+  lib/asyncsafe-spin.h
+  lib/at-func.c
+  lib/attribute.h
   lib/basename-lgpl.c
+  lib/basename-lgpl.h
   lib/basename.c
+  lib/binary-io.c
   lib/binary-io.h
+  lib/bitrotate.c
+  lib/bitrotate.h
   lib/btowc.c
+  lib/c++defs.h
   lib/c-ctype.c
   lib/c-ctype.h
   lib/c-stack.c
   lib/c-stack.h
+  lib/c-strcase.h
+  lib/c-strcasecmp.c
+  lib/c-strcaseeq.h
+  lib/c-strncasecmp.c
+  lib/calloc.c
   lib/canonicalize-lgpl.c
+  lib/canonicalize.c
+  lib/canonicalize.h
+  lib/cdefs.h
+  lib/chdir-long.c
+  lib/chdir-long.h
+  lib/clean-temp-private.h
+  lib/clean-temp-simple.c
+  lib/clean-temp-simple.h
   lib/clean-temp.c
   lib/clean-temp.h
   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/closein.c
   lib/closein.h
   lib/closeout.c
   lib/closeout.h
-  lib/config.charset
+  lib/concat-filename.c
+  lib/concat-filename.h
+  lib/dirent-private.h
+  lib/dirent.in.h
+  lib/dirfd.c
   lib/dirname-lgpl.c
   lib/dirname.c
   lib/dirname.h
-  lib/dosname.h
   lib/dup-safer-flag.c
   lib/dup-safer.c
+  lib/dup.c
   lib/dup2.c
+  lib/dynarray.h
+  lib/eloop-threshold.h
   lib/errno.in.h
   lib/error.c
   lib/error.h
@@ -1161,16 +2241,27 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/exitfail.h
   lib/fatal-signal.c
   lib/fatal-signal.h
+  lib/fchdir.c
   lib/fclose.c
   lib/fcntl.c
   lib/fcntl.in.h
+  lib/fd-hook.c
+  lib/fd-hook.h
   lib/fd-safer-flag.c
   lib/fd-safer.c
+  lib/fdopendir.c
   lib/fflush.c
+  lib/file-set.c
+  lib/file-set.h
+  lib/filename.h
   lib/filenamecat-lgpl.c
   lib/filenamecat.c
   lib/filenamecat.h
+  lib/findprog-in.c
+  lib/findprog.h
+  lib/flexmember.h
   lib/float+.h
+  lib/float.c
   lib/float.in.h
   lib/fopen-safer.c
   lib/fopen.c
@@ -1182,24 +2273,43 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/freadahead.h
   lib/freading.c
   lib/freading.h
+  lib/free.c
   lib/frexp.c
   lib/frexpl.c
+  lib/fseek.c
   lib/fseeko.c
+  lib/fstat.c
+  lib/fstatat.c
+  lib/ftell.c
   lib/ftello.c
+  lib/getcwd-lgpl.c
+  lib/getcwd.c
   lib/getdtablesize.c
+  lib/getopt-cdefs.in.h
+  lib/getopt-core.h
+  lib/getopt-ext.h
+  lib/getopt-pfx-core.h
+  lib/getopt-pfx-ext.h
   lib/getopt.c
   lib/getopt.in.h
   lib/getopt1.c
   lib/getopt_int.h
+  lib/getpagesize.c
+  lib/getprogname.c
+  lib/getprogname.h
+  lib/getrandom.c
   lib/gettext.h
-  lib/gettimeofday.c
-  lib/gl_anyhash_list1.h
-  lib/gl_anyhash_list2.h
+  lib/gl_anyhash1.h
+  lib/gl_anyhash2.h
+  lib/gl_anyhash_primes.h
   lib/gl_anylinked_list1.h
   lib/gl_anylinked_list2.h
   lib/gl_anytree_oset.h
+  lib/gl_avltree_ordered.h
   lib/gl_avltree_oset.c
   lib/gl_avltree_oset.h
+  lib/gl_linked_list.c
+  lib/gl_linked_list.h
   lib/gl_linkedhash_list.c
   lib/gl_linkedhash_list.h
   lib/gl_list.c
@@ -1215,8 +2325,28 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/glthread/threadlib.c
   lib/glthread/tls.c
   lib/glthread/tls.h
+  lib/hard-locale.c
+  lib/hard-locale.h
+  lib/hash-pjw.c
+  lib/hash-pjw.h
+  lib/hash-triple-simple.c
+  lib/hash-triple.h
+  lib/hash.c
+  lib/hash.h
+  lib/iconv.c
+  lib/iconv.in.h
+  lib/iconv_close.c
+  lib/iconv_open-aix.gperf
+  lib/iconv_open-hpux.gperf
+  lib/iconv_open-irix.gperf
+  lib/iconv_open-osf.gperf
+  lib/iconv_open-solaris.gperf
+  lib/iconv_open-zos.gperf
+  lib/iconv_open.c
+  lib/idx.h
   lib/ignore-value.h
   lib/intprops.h
+  lib/inttypes.in.h
   lib/isnan.c
   lib/isnand-nolibm.h
   lib/isnand.c
@@ -1224,34 +2354,90 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/isnanf.c
   lib/isnanl-nolibm.h
   lib/isnanl.c
+  lib/iswblank.c
+  lib/iswdigit.c
+  lib/iswxdigit.c
+  lib/itold.c
   lib/langinfo.in.h
+  lib/lc-charset-dispatch.c
+  lib/lc-charset-dispatch.h
+  lib/libc-config.h
+  lib/limits.in.h
   lib/localcharset.c
   lib/localcharset.h
+  lib/locale.in.h
+  lib/localeconv.c
+  lib/localename-table.c
+  lib/localename-table.h
+  lib/localename.c
+  lib/localename.h
   lib/lseek.c
   lib/lstat.c
   lib/malloc.c
+  lib/malloc/dynarray-skeleton.c
+  lib/malloc/dynarray.h
+  lib/malloc/dynarray_at_failure.c
+  lib/malloc/dynarray_emplace_enlarge.c
+  lib/malloc/dynarray_finalize.c
+  lib/malloc/dynarray_resize.c
+  lib/malloc/dynarray_resize_clear.c
+  lib/malloc/scratch_buffer.h
+  lib/malloc/scratch_buffer_dupfree.c
+  lib/malloc/scratch_buffer_grow.c
+  lib/malloc/scratch_buffer_grow_preserve.c
+  lib/malloc/scratch_buffer_set_array_size.c
   lib/malloca.c
   lib/malloca.h
-  lib/malloca.valgrind
+  lib/math.c
   lib/math.in.h
+  lib/mbchar.c
+  lib/mbchar.h
+  lib/mbiter.c
+  lib/mbiter.h
+  lib/mbrtowc-impl-utf8.h
+  lib/mbrtowc-impl.h
   lib/mbrtowc.c
   lib/mbsinit.c
+  lib/mbslen.c
+  lib/mbsstr.c
   lib/mbtowc-impl.h
+  lib/mbtowc-lock.c
+  lib/mbtowc-lock.h
   lib/mbtowc.c
+  lib/mbuiter.c
+  lib/mbuiter.h
   lib/memchr.c
   lib/memchr.valgrind
   lib/memchr2.c
   lib/memchr2.h
   lib/memchr2.valgrind
+  lib/mempcpy.c
+  lib/memrchr.c
+  lib/minmax.h
+  lib/mkdir.c
   lib/mkdtemp.c
   lib/mkstemp-safer.c
   lib/mkstemp.c
+  lib/msvc-inval.c
+  lib/msvc-inval.h
+  lib/msvc-nothrow.c
+  lib/msvc-nothrow.h
+  lib/nl_langinfo-lock.c
   lib/nl_langinfo.c
   lib/obstack.c
   lib/obstack.h
   lib/open.c
+  lib/openat-die.c
+  lib/openat-priv.h
+  lib/openat-proc.c
+  lib/openat.c
+  lib/openat.h
+  lib/opendir.c
+  lib/os2-spawn.c
+  lib/os2-spawn.h
   lib/pathmax.h
   lib/pipe-safer.c
+  lib/pipe.c
   lib/pipe2-safer.c
   lib/pipe2.c
   lib/printf-args.c
@@ -1264,13 +2450,18 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/printf-parse.h
   lib/progname.c
   lib/progname.h
+  lib/propername.c
+  lib/propername.h
+  lib/quote.h
   lib/quotearg.c
   lib/quotearg.h
+  lib/raise.c
   lib/rawmemchr.c
   lib/rawmemchr.valgrind
+  lib/readdir.c
   lib/readlink.c
-  lib/ref-add.sin
-  lib/ref-del.sin
+  lib/realloc.c
+  lib/reallocarray.c
   lib/regcomp.c
   lib/regex.c
   lib/regex.h
@@ -1278,9 +2469,19 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/regex_internal.h
   lib/regexec.c
   lib/rename.c
+  lib/rewinddir.c
   lib/rmdir.c
   lib/same-inode.h
+  lib/save-cwd.c
+  lib/save-cwd.h
   lib/sched.in.h
+  lib/scratch_buffer.h
+  lib/secure_getenv.c
+  lib/setlocale-lock.c
+  lib/setlocale.c
+  lib/setlocale_null.c
+  lib/setlocale_null.h
+  lib/sig-handler.c
   lib/sig-handler.h
   lib/sigaction.c
   lib/siglist.h
@@ -1289,11 +2490,15 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/signbitf.c
   lib/signbitl.c
   lib/sigprocmask.c
+  lib/sigsegv.c
+  lib/sigsegv.in.h
   lib/size_max.h
   lib/snprintf.c
   lib/spawn-pipe.c
   lib/spawn-pipe.h
+  lib/spawn.c
   lib/spawn.in.h
+  lib/spawn_faction_addchdir.c
   lib/spawn_faction_addclose.c
   lib/spawn_faction_adddup2.c
   lib/spawn_faction_addopen.c
@@ -1303,10 +2508,18 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/spawnattr_destroy.c
   lib/spawnattr_init.c
   lib/spawnattr_setflags.c
+  lib/spawnattr_setpgroup.c
   lib/spawnattr_setsigmask.c
   lib/spawni.c
   lib/spawnp.c
+  lib/stackvma.c
+  lib/stackvma.h
+  lib/stat-time.c
+  lib/stat-time.h
+  lib/stat-w32.c
+  lib/stat-w32.h
   lib/stat.c
+  lib/stdalign.in.h
   lib/stdarg.in.h
   lib/stdbool.in.h
   lib/stddef.in.h
@@ -1314,35 +2527,58 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/stdio--.h
   lib/stdio-impl.h
   lib/stdio-safer.h
+  lib/stdio-write.c
   lib/stdio.in.h
   lib/stdlib--.h
   lib/stdlib-safer.h
   lib/stdlib.in.h
+  lib/stpcpy.c
+  lib/str-kmp.h
   lib/str-two-way.h
   lib/strchrnul.c
   lib/strchrnul.valgrind
+  lib/strdup.c
   lib/streq.h
+  lib/strerror-override.c
+  lib/strerror-override.h
   lib/strerror.c
+  lib/striconv.c
+  lib/striconv.h
   lib/string.in.h
   lib/stripslash.c
   lib/strndup.c
   lib/strnlen.c
+  lib/strnlen1.c
+  lib/strnlen1.h
   lib/strsignal.c
   lib/strstr.c
   lib/strtod.c
-  lib/strtol.c
+  lib/sys_random.in.h
   lib/sys_stat.in.h
-  lib/sys_time.in.h
+  lib/sys_types.in.h
   lib/sys_wait.in.h
   lib/tempname.c
   lib/tempname.h
+  lib/thread-optim.h
   lib/time.in.h
   lib/tmpdir.c
   lib/tmpdir.h
+  lib/trim.c
+  lib/trim.h
   lib/unistd--.h
   lib/unistd-safer.h
+  lib/unistd.c
   lib/unistd.in.h
+  lib/unistr.in.h
+  lib/unistr/u8-mbtoucr.c
+  lib/unistr/u8-uctomb-aux.c
+  lib/unistr/u8-uctomb.c
+  lib/unitypes.in.h
+  lib/uniwidth.in.h
+  lib/uniwidth/cjk.h
+  lib/uniwidth/width.c
   lib/unlocked-io.h
+  lib/unused-parameter.h
   lib/vasnprintf.c
   lib/vasnprintf.h
   lib/vasprintf.c
@@ -1352,14 +2588,32 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/version-etc-fsf.c
   lib/version-etc.c
   lib/version-etc.h
-  lib/w32spawn.h
   lib/wait-process.c
   lib/wait-process.h
   lib/waitpid.c
+  lib/warn-on-use.h
   lib/wchar.in.h
   lib/wcrtomb.c
+  lib/wctype-h.c
   lib/wctype.in.h
+  lib/wcwidth.c
+  lib/windows-initguard.h
+  lib/windows-mutex.c
+  lib/windows-mutex.h
+  lib/windows-once.c
+  lib/windows-once.h
+  lib/windows-recmutex.c
+  lib/windows-recmutex.h
+  lib/windows-rwlock.c
+  lib/windows-rwlock.h
+  lib/windows-spawn.c
+  lib/windows-spawn.h
+  lib/windows-spin.c
+  lib/windows-spin.h
+  lib/windows-tls.c
+  lib/windows-tls.h
   lib/xalloc-die.c
+  lib/xalloc-oversized.h
   lib/xalloc.h
   lib/xasprintf.c
   lib/xmalloc.c
@@ -1367,73 +2621,120 @@ AC_DEFUN([M4_FILE_LIST], [
   lib/xmalloca.h
   lib/xprintf.c
   lib/xprintf.h
+  lib/xsize.c
   lib/xsize.h
+  lib/xstriconv.c
+  lib/xstriconv.h
   lib/xstrndup.c
   lib/xstrndup.h
   lib/xvasprintf.c
   lib/xvasprintf.h
   m4/00gnulib.m4
+  m4/__inline.m4
+  m4/absolute-header.m4
+  m4/access.m4
   m4/alloca.m4
   m4/ansi-c++.m4
+  m4/arpa_inet_h.m4
+  m4/asm-underscore.m4
   m4/assert.m4
   m4/autobuild.m4
   m4/btowc.m4
+  m4/builtin-expect.m4
   m4/c-stack.m4
+  m4/calloc.m4
   m4/canonicalize.m4
-  m4/cloexec.m4
-  m4/close-stream.m4
+  m4/chdir-long.m4
+  m4/clock_time.m4
   m4/close.m4
-  m4/closein.m4
-  m4/closeout.m4
+  m4/closedir.m4
   m4/codeset.m4
   m4/config-h.m4
   m4/configmake.m4
-  m4/dirname.m4
+  m4/creat.m4
+  m4/ctype_h.m4
+  m4/d-ino.m4
+  m4/dirent_h.m4
+  m4/dirfd.m4
   m4/double-slash-root.m4
+  m4/dup.m4
   m4/dup2.m4
+  m4/eaccess.m4
   m4/eealloc.m4
   m4/environ.m4
   m4/errno_h.m4
   m4/error.m4
   m4/execute.m4
+  m4/explicit_bzero.m4
   m4/exponentd.m4
   m4/exponentf.m4
   m4/exponentl.m4
   m4/extensions.m4
+  m4/extern-inline.m4
   m4/fatal-signal.m4
+  m4/fchdir.m4
   m4/fclose.m4
   m4/fcntl-o.m4
   m4/fcntl.m4
   m4/fcntl_h.m4
+  m4/fdopen.m4
+  m4/fdopendir.m4
   m4/fflush.m4
   m4/filenamecat.m4
+  m4/findprog-in.m4
+  m4/findprog.m4
+  m4/flexmember.m4
   m4/float_h.m4
   m4/fopen.m4
   m4/fpending.m4
   m4/fpieee.m4
   m4/fpurge.m4
+  m4/freadahead.m4
   m4/freading.m4
+  m4/free.m4
+  m4/freopen.m4
   m4/frexp.m4
   m4/frexpl.m4
+  m4/fseek.m4
   m4/fseeko.m4
+  m4/fstat.m4
+  m4/fstatat.m4
   m4/ftell.m4
   m4/ftello.m4
+  m4/ftruncate.m4
+  m4/getcwd-abort-bug.m4
+  m4/getcwd-path-max.m4
+  m4/getcwd.m4
   m4/getdtablesize.m4
   m4/getopt.m4
   m4/getpagesize.m4
+  m4/getprogname.m4
+  m4/getrandom.m4
   m4/gettimeofday.m4
-  m4/gl_list.m4
-  m4/glibc21.m4
   m4/gnulib-common.m4
+  m4/host-cpu-c-abi.m4
+  m4/iconv.m4
+  m4/iconv_h.m4
+  m4/iconv_open.m4
   m4/include_next.m4
+  m4/inet_pton.m4
   m4/inline.m4
+  m4/intl-thread-locale.m4
   m4/intlmacosx.m4
   m4/intmax_t.m4
+  m4/inttostr.m4
+  m4/inttypes.m4
   m4/inttypes_h.m4
+  m4/ioctl.m4
+  m4/isblank.m4
   m4/isnand.m4
   m4/isnanf.m4
   m4/isnanl.m4
+  m4/iswblank.m4
+  m4/iswdigit.m4
+  m4/iswxdigit.m4
   m4/langinfo_h.m4
+  m4/largefile.m4
   m4/lcmessage.m4
   m4/ldexp.m4
   m4/ldexpl.m4
@@ -1441,6 +2742,8 @@ AC_DEFUN([M4_FILE_LIST], [
   m4/lib-link.m4
   m4/lib-prefix.m4
   m4/libsigsegv.m4
+  m4/libunistring-base.m4
+  m4/limits-h.m4
   m4/link.m4
   m4/localcharset.m4
   m4/locale-fr.m4
@@ -1448,79 +2751,137 @@ AC_DEFUN([M4_FILE_LIST], [
   m4/locale-tr.m4
   m4/locale-zh.m4
   m4/locale_h.m4
+  m4/localeconv.m4
   m4/localename.m4
   m4/lock.m4
-  m4/longlong.m4
   m4/lseek.m4
   m4/lstat.m4
   m4/malloc.m4
   m4/malloca.m4
+  m4/manywarnings-c++.m4
   m4/manywarnings.m4
   m4/math_h.m4
+  m4/mbchar.m4
+  m4/mbiter.m4
   m4/mbrtowc.m4
   m4/mbsinit.m4
+  m4/mbslen.m4
   m4/mbstate_t.m4
   m4/mbtowc.m4
   m4/memchr.m4
+  m4/mempcpy.m4
+  m4/memrchr.m4
+  m4/minmax.m4
+  m4/mkdir.m4
   m4/mkdtemp.m4
   m4/mkstemp.m4
   m4/mmap-anon.m4
   m4/mode_t.m4
+  m4/msvc-inval.m4
+  m4/msvc-nothrow.m4
   m4/multiarch.m4
+  m4/musl.m4
+  m4/nanosleep.m4
+  m4/netinet_in_h.m4
   m4/nl_langinfo.m4
   m4/nocrash.m4
+  m4/obstack.m4
+  m4/off_t.m4
+  m4/open-cloexec.m4
+  m4/open-slash.m4
   m4/open.m4
+  m4/openat.m4
+  m4/opendir.m4
   m4/pathmax.m4
+  m4/perror.m4
+  m4/pid_t.m4
+  m4/pipe.m4
   m4/pipe2.m4
   m4/posix_spawn.m4
+  m4/posix_spawn_faction_addchdir.m4
   m4/printf-frexp.m4
   m4/printf-frexpl.m4
   m4/printf.m4
+  m4/pthread-thread.m4
+  m4/pthread_h.m4
+  m4/pthread_rwlock_rdlock.m4
+  m4/pthread_sigmask.m4
   m4/putenv.m4
   m4/quotearg.m4
+  m4/raise.m4
   m4/rawmemchr.m4
+  m4/read-file.m4
+  m4/readdir.m4
   m4/readlink.m4
+  m4/realloc.m4
+  m4/reallocarray.m4
   m4/regex.m4
   m4/rename.m4
+  m4/rewinddir.m4
   m4/rmdir.m4
+  m4/save-cwd.m4
   m4/sched_h.m4
+  m4/sched_yield.m4
+  m4/secure_getenv.m4
+  m4/select.m4
+  m4/semaphore.m4
   m4/setenv.m4
   m4/setlocale.m4
+  m4/setlocale_null.m4
+  m4/sh-filename.m4
   m4/sig_atomic_t.m4
   m4/sigaction.m4
+  m4/sigaltstack.m4
   m4/signal_h.m4
   m4/signalblocking.m4
   m4/signbit.m4
+  m4/sigpipe.m4
   m4/size_max.m4
+  m4/sleep.m4
   m4/snprintf.m4
+  m4/socketlib.m4
+  m4/sockets.m4
+  m4/socklen.m4
+  m4/sockpfaf.m4
+  m4/sparcv8+.m4
   m4/spawn-pipe.m4
   m4/spawn_h.m4
   m4/ssize_t.m4
+  m4/stack-direction.m4
+  m4/stat-time.m4
   m4/stat.m4
+  m4/std-gnu11.m4
+  m4/stdalign.m4
   m4/stdarg.m4
   m4/stdbool.m4
   m4/stddef_h.m4
   m4/stdint.m4
   m4/stdint_h.m4
-  m4/stdio-safer.m4
   m4/stdio_h.m4
-  m4/stdlib-safer.m4
   m4/stdlib_h.m4
+  m4/stpcpy.m4
   m4/strchrnul.m4
   m4/strdup.m4
   m4/strerror.m4
+  m4/strerror_r.m4
   m4/string_h.m4
   m4/strndup.m4
   m4/strnlen.m4
   m4/strsignal.m4
   m4/strstr.m4
   m4/strtod.m4
-  m4/strtol.m4
   m4/symlink.m4
+  m4/sys_ioctl_h.m4
+  m4/sys_random_h.m4
+  m4/sys_select_h.m4
+  m4/sys_socket_h.m4
   m4/sys_stat_h.m4
   m4/sys_time_h.m4
+  m4/sys_types_h.m4
+  m4/sys_uio_h.m4
   m4/sys_wait_h.m4
   m4/tempname.m4
+  m4/thread.m4
   m4/threadlib.m4
   m4/time_h.m4
   m4/tls.m4
@@ -1533,6 +2894,7 @@ AC_DEFUN([M4_FILE_LIST], [
   m4/vasprintf-posix.m4
   m4/vasprintf.m4
   m4/version-etc.m4
+  m4/visibility.m4
   m4/wait-process.m4
   m4/waitpid.m4
   m4/warn-on-use.m4
@@ -1543,22 +2905,47 @@ AC_DEFUN([M4_FILE_LIST], [
   m4/wctob.m4
   m4/wctomb.m4
   m4/wctype_h.m4
+  m4/wcwidth.m4
   m4/wint_t.m4
+  m4/write.m4
   m4/xalloc.m4
   m4/xsize.m4
   m4/xstrndup.m4
   m4/xvasprintf.m4
+  m4/yield.m4
+  m4/zzgnulib.m4
+  tests/altstack-util.h
+  tests/atomic-int-gnulib.h
+  tests/executable-script
+  tests/executable-script.sh
+  tests/executable-shell-script
+  tests/infinity.h
   tests/init.sh
+  tests/locale.c
   tests/macros.h
   tests/minus-zero.h
+  tests/mmap-anon-util.h
   tests/nan.h
+  tests/nap.h
+  tests/null-ptr.h
+  tests/randomd.c
+  tests/randoml.c
   tests/signature.h
+  tests/test-accept.c
+  tests/test-access.c
+  tests/test-alignof.c
   tests/test-alloca-opt.c
+  tests/test-arpa_inet-c++.cc
+  tests/test-arpa_inet.c
   tests/test-array_list.c
   tests/test-array_oset.c
+  tests/test-asyncsafe-spin1.c
+  tests/test-asyncsafe-spin2.c
   tests/test-avltree_oset.c
   tests/test-binary-io.c
   tests/test-binary-io.sh
+  tests/test-bind.c
+  tests/test-bitrotate.c
   tests/test-btowc.c
   tests/test-btowc1.sh
   tests/test-btowc2.sh
@@ -1569,36 +2956,79 @@ AC_DEFUN([M4_FILE_LIST], [
   tests/test-c-strcase.sh
   tests/test-c-strcasecmp.c
   tests/test-c-strncasecmp.c
+  tests/test-calloc-gnu.c
   tests/test-canonicalize-lgpl.c
+  tests/test-canonicalize.c
+  tests/test-chdir.c
   tests/test-cloexec.c
+  tests/test-close.c
   tests/test-closein.c
   tests/test-closein.sh
+  tests/test-connect.c
+  tests/test-creat.c
+  tests/test-ctype-c++.cc
+  tests/test-ctype-c++2.cc
+  tests/test-ctype.c
+  tests/test-dirent-c++.cc
+  tests/test-dirent.c
   tests/test-dirname.c
   tests/test-dup-safer.c
+  tests/test-dup.c
   tests/test-dup2.c
+  tests/test-dynarray.c
   tests/test-environ.c
+  tests/test-errno-c++.cc
+  tests/test-errno-c++2.cc
   tests/test-errno.c
+  tests/test-execute-child.c
+  tests/test-execute-main.c
+  tests/test-execute-script.c
+  tests/test-execute.sh
+  tests/test-explicit_bzero.c
+  tests/test-fchdir.c
+  tests/test-fclose.c
   tests/test-fcntl-h-c++.cc
   tests/test-fcntl-h.c
   tests/test-fcntl.c
+  tests/test-fdopen.c
+  tests/test-fdopendir.c
   tests/test-fflush.c
   tests/test-fflush2.c
   tests/test-fflush2.sh
+  tests/test-fgetc.c
   tests/test-filenamecat.c
+  tests/test-float-c++.cc
+  tests/test-float-c++2.cc
+  tests/test-float.c
+  tests/test-fopen-gnu.c
   tests/test-fopen-safer.c
   tests/test-fopen.c
   tests/test-fopen.h
   tests/test-fpending.c
   tests/test-fpending.sh
   tests/test-fpurge.c
+  tests/test-fputc.c
+  tests/test-fread.c
   tests/test-freadahead.c
   tests/test-freadahead.sh
   tests/test-freading.c
+  tests/test-free.c
+  tests/test-freopen.c
   tests/test-frexp.c
+  tests/test-frexp.h
   tests/test-frexpl.c
+  tests/test-fseek.c
+  tests/test-fseek.sh
+  tests/test-fseek2.sh
   tests/test-fseeko.c
   tests/test-fseeko.sh
   tests/test-fseeko2.sh
+  tests/test-fseeko3.c
+  tests/test-fseeko3.sh
+  tests/test-fseeko4.c
+  tests/test-fseeko4.sh
+  tests/test-fstat.c
+  tests/test-fstatat.c
   tests/test-ftell.c
   tests/test-ftell.sh
   tests/test-ftell2.sh
@@ -1607,26 +3037,63 @@ AC_DEFUN([M4_FILE_LIST], [
   tests/test-ftello.sh
   tests/test-ftello2.sh
   tests/test-ftello3.c
+  tests/test-ftello4.c
+  tests/test-ftello4.sh
+  tests/test-ftruncate.c
+  tests/test-ftruncate.sh
+  tests/test-fwrite.c
+  tests/test-getcwd-lgpl.c
+  tests/test-getcwd.c
+  tests/test-getcwd.sh
   tests/test-getdtablesize.c
-  tests/test-getopt.c
+  tests/test-getopt-gnu.c
+  tests/test-getopt-main.h
   tests/test-getopt.h
   tests/test-getopt_long.h
+  tests/test-getprogname.c
+  tests/test-getrandom.c
   tests/test-gettimeofday.c
+  tests/test-hard-locale.c
+  tests/test-hash.c
+  tests/test-iconv-h-c++.cc
+  tests/test-iconv-h.c
+  tests/test-iconv.c
   tests/test-ignore-value.c
+  tests/test-inet_pton.c
+  tests/test-init.sh
+  tests/test-intprops.c
+  tests/test-inttostr.c
+  tests/test-inttypes-c++.cc
+  tests/test-inttypes-c++2.cc
+  tests/test-inttypes.c
+  tests/test-ioctl.c
+  tests/test-isblank.c
   tests/test-isnand-nolibm.c
   tests/test-isnand.h
   tests/test-isnanf-nolibm.c
   tests/test-isnanf.h
   tests/test-isnanl-nolibm.c
   tests/test-isnanl.h
+  tests/test-iswblank.c
+  tests/test-iswdigit.c
+  tests/test-iswdigit.sh
+  tests/test-iswxdigit.c
+  tests/test-iswxdigit.sh
   tests/test-langinfo-c++.cc
   tests/test-langinfo.c
+  tests/test-limits-h-c++.cc
+  tests/test-limits-h-c++2.cc
+  tests/test-limits-h.c
   tests/test-link.c
   tests/test-link.h
+  tests/test-linked_list.c
   tests/test-linkedhash_list.c
+  tests/test-listen.c
+  tests/test-localcharset.c
   tests/test-locale-c++.cc
   tests/test-locale-c++2.cc
   tests/test-locale.c
+  tests/test-localeconv.c
   tests/test-localename.c
   tests/test-lseek.c
   tests/test-lseek.sh
@@ -1642,56 +3109,128 @@ AC_DEFUN([M4_FILE_LIST], [
   tests/test-mbrtowc-w32-3.sh
   tests/test-mbrtowc-w32-4.sh
   tests/test-mbrtowc-w32-5.sh
+  tests/test-mbrtowc-w32-6.sh
+  tests/test-mbrtowc-w32-7.sh
   tests/test-mbrtowc-w32.c
   tests/test-mbrtowc.c
   tests/test-mbrtowc1.sh
   tests/test-mbrtowc2.sh
   tests/test-mbrtowc3.sh
   tests/test-mbrtowc4.sh
+  tests/test-mbrtowc5.sh
   tests/test-mbsinit.c
   tests/test-mbsinit.sh
+  tests/test-mbsstr1.c
+  tests/test-mbsstr2.c
+  tests/test-mbsstr2.sh
+  tests/test-mbsstr3.c
+  tests/test-mbsstr3.sh
   tests/test-memchr.c
   tests/test-memchr2.c
+  tests/test-memrchr.c
+  tests/test-mkdir.c
+  tests/test-mkdir.h
+  tests/test-nanosleep.c
+  tests/test-netinet_in.c
+  tests/test-nl_langinfo-mt.c
   tests/test-nl_langinfo.c
   tests/test-nl_langinfo.sh
   tests/test-open.c
   tests/test-open.h
+  tests/test-openat.c
+  tests/test-oset-update.h
+  tests/test-pathmax.c
+  tests/test-perror.c
+  tests/test-perror.sh
+  tests/test-perror2.c
+  tests/test-pipe.c
   tests/test-pipe2.c
-  tests/test-posix_spawn1.c
-  tests/test-posix_spawn1.in.sh
-  tests/test-posix_spawn2.c
-  tests/test-posix_spawn2.in.sh
+  tests/test-posix_spawn-chdir.c
+  tests/test-posix_spawn-dup2-stdin.c
+  tests/test-posix_spawn-dup2-stdin.in.sh
+  tests/test-posix_spawn-dup2-stdout.c
+  tests/test-posix_spawn-dup2-stdout.in.sh
+  tests/test-posix_spawn-inherit0.c
+  tests/test-posix_spawn-inherit1.c
+  tests/test-posix_spawn-open1.c
+  tests/test-posix_spawn-open2.c
+  tests/test-posix_spawn-script.c
+  tests/test-posix_spawn_file_actions_addchdir.c
+  tests/test-posix_spawn_file_actions_addclose.c
+  tests/test-posix_spawn_file_actions_adddup2.c
+  tests/test-posix_spawn_file_actions_addopen.c
+  tests/test-posix_spawnp-script.c
   tests/test-printf-frexp.c
   tests/test-printf-frexpl.c
+  tests/test-pthread-c++.cc
+  tests/test-pthread-thread.c
+  tests/test-pthread.c
+  tests/test-pthread_sigmask1.c
+  tests/test-pthread_sigmask2.c
   tests/test-quotearg-simple.c
   tests/test-quotearg.h
+  tests/test-raise.c
   tests/test-rawmemchr.c
+  tests/test-read-file.c
   tests/test-readlink.c
   tests/test-readlink.h
+  tests/test-realloc-gnu.c
+  tests/test-reallocarray.c
+  tests/test-regex.c
   tests/test-rename.c
   tests/test-rename.h
   tests/test-rmdir.c
   tests/test-rmdir.h
   tests/test-sched.c
+  tests/test-scratch-buffer.c
+  tests/test-select-fd.c
+  tests/test-select-in.sh
+  tests/test-select-out.sh
+  tests/test-select-stdin.c
+  tests/test-select.c
+  tests/test-select.h
   tests/test-setenv.c
   tests/test-setlocale1.c
   tests/test-setlocale1.sh
   tests/test-setlocale2.c
   tests/test-setlocale2.sh
+  tests/test-setlocale_null-mt-all.c
+  tests/test-setlocale_null-mt-one.c
+  tests/test-setlocale_null.c
+  tests/test-setsockopt.c
   tests/test-sigaction.c
-  tests/test-signal-c++.cc
-  tests/test-signal-c++2.cc
-  tests/test-signal.c
+  tests/test-signal-h-c++.cc
+  tests/test-signal-h-c++2.cc
+  tests/test-signal-h.c
   tests/test-signbit.c
+  tests/test-sigpipe.c
+  tests/test-sigpipe.sh
+  tests/test-sigprocmask.c
+  tests/test-sigsegv-catch-segv1.c
+  tests/test-sigsegv-catch-segv2.c
+  tests/test-sigsegv-catch-stackoverflow1.c
+  tests/test-sigsegv-catch-stackoverflow2.c
+  tests/test-sleep.c
   tests/test-snprintf.c
+  tests/test-sockets.c
   tests/test-spawn-c++.cc
-  tests/test-spawn-pipe.c
+  tests/test-spawn-pipe-child.c
+  tests/test-spawn-pipe-main.c
+  tests/test-spawn-pipe-script.c
   tests/test-spawn-pipe.sh
   tests/test-spawn.c
+  tests/test-stat-time.c
   tests/test-stat.c
   tests/test-stat.h
+  tests/test-stdalign.c
+  tests/test-stdbool-c++.cc
+  tests/test-stdbool-c++2.cc
   tests/test-stdbool.c
+  tests/test-stddef-c++.cc
+  tests/test-stddef-c++2.cc
   tests/test-stddef.c
+  tests/test-stdint-c++.cc
+  tests/test-stdint-c++2.cc
   tests/test-stdint.c
   tests/test-stdio-c++.cc
   tests/test-stdio-c++2.cc
@@ -1701,6 +3240,8 @@ AC_DEFUN([M4_FILE_LIST], [
   tests/test-stdlib.c
   tests/test-strchrnul.c
   tests/test-strerror.c
+  tests/test-strerror_r.c
+  tests/test-striconv.c
   tests/test-string-c++.cc
   tests/test-string-c++2.cc
   tests/test-string.c
@@ -1708,15 +3249,30 @@ AC_DEFUN([M4_FILE_LIST], [
   tests/test-strsignal.c
   tests/test-strstr.c
   tests/test-strtod.c
+  tests/test-strtod1.c
+  tests/test-strtod1.sh
   tests/test-symlink.c
   tests/test-symlink.h
+  tests/test-sys_ioctl-c++.cc
+  tests/test-sys_ioctl.c
+  tests/test-sys_random-c++.cc
+  tests/test-sys_random.c
+  tests/test-sys_select-c++.cc
+  tests/test-sys_select.c
+  tests/test-sys_socket-c++.cc
+  tests/test-sys_socket.c
   tests/test-sys_stat-c++.cc
   tests/test-sys_stat.c
   tests/test-sys_time-c++.cc
   tests/test-sys_time.c
+  tests/test-sys_types-c++.cc
+  tests/test-sys_types.c
+  tests/test-sys_uio.c
   tests/test-sys_wait-c++.cc
   tests/test-sys_wait.c
   tests/test-sys_wait.h
+  tests/test-thread_create.c
+  tests/test-thread_self.c
   tests/test-time-c++.cc
   tests/test-time-c++2.cc
   tests/test-time.c
@@ -1729,48 +3285,115 @@ AC_DEFUN([M4_FILE_LIST], [
   tests/test-vasprintf.c
   tests/test-vc-list-files-cvs.sh
   tests/test-vc-list-files-git.sh
+  tests/test-verify-try.c
   tests/test-verify.c
   tests/test-verify.sh
   tests/test-version-etc.c
   tests/test-version-etc.sh
   tests/test-wchar-c++.cc
+  tests/test-wchar-c++2.cc
+  tests/test-wchar-c++3.cc
   tests/test-wchar.c
   tests/test-wcrtomb-w32-1.sh
   tests/test-wcrtomb-w32-2.sh
   tests/test-wcrtomb-w32-3.sh
   tests/test-wcrtomb-w32-4.sh
   tests/test-wcrtomb-w32-5.sh
+  tests/test-wcrtomb-w32-6.sh
+  tests/test-wcrtomb-w32-7.sh
   tests/test-wcrtomb-w32.c
   tests/test-wcrtomb.c
   tests/test-wcrtomb.sh
   tests/test-wctype-h-c++.cc
+  tests/test-wctype-h-c++2.cc
   tests/test-wctype-h.c
+  tests/test-wcwidth.c
+  tests/test-write.c
   tests/test-xalloc-die.c
   tests/test-xalloc-die.sh
   tests/test-xvasprintf.c
+  tests/unistr/test-u8-mbtoucr.c
+  tests/unistr/test-u8-uctomb.c
+  tests/uniwidth/test-uc_width.c
+  tests/uniwidth/test-uc_width2.c
+  tests/uniwidth/test-uc_width2.sh
   tests/zerosize-ptr.h
-  tests=lib/c-strcase.h
-  tests=lib/c-strcasecmp.c
-  tests=lib/c-strncasecmp.c
-  tests=lib/ftell.c
-  tests=lib/getpagesize.c
+  tests=lib/_Noreturn.h
+  tests=lib/accept.c
+  tests=lib/alloca.c
+  tests=lib/anytostr.c
+  tests=lib/arg-nonnull.h
+  tests=lib/arpa_inet.in.h
+  tests=lib/bind.c
+  tests=lib/c++defs.h
+  tests=lib/concat-filename.h
+  tests=lib/connect.c
+  tests=lib/creat.c
+  tests=lib/ctype.in.h
+  tests=lib/explicit_bzero.c
+  tests=lib/fdopen.c
+  tests=lib/findprog.c
+  tests=lib/findprog.h
+  tests=lib/freopen.c
+  tests=lib/ftruncate.c
+  tests=lib/gettimeofday.c
   tests=lib/gl_array_list.c
   tests=lib/gl_array_list.h
   tests=lib/gl_array_oset.c
   tests=lib/gl_array_oset.h
+  tests=lib/glthread/thread.c
+  tests=lib/glthread/thread.h
+  tests=lib/glthread/yield.h
+  tests=lib/imaxtostr.c
+  tests=lib/inet_pton.c
+  tests=lib/inttostr.c
+  tests=lib/inttostr.h
+  tests=lib/ioctl.c
+  tests=lib/isblank.c
   tests=lib/link.c
-  tests=lib/locale.in.h
-  tests=lib/localename.c
-  tests=lib/localename.h
+  tests=lib/listen.c
+  tests=lib/nanosleep.c
+  tests=lib/netinet_in.in.h
+  tests=lib/offtostr.c
+  tests=lib/perror.c
+  tests=lib/pthread-thread.c
+  tests=lib/pthread.in.h
+  tests=lib/pthread_sigmask.c
   tests=lib/putenv.c
+  tests=lib/read-file.c
+  tests=lib/read-file.h
+  tests=lib/root-uid.h
+  tests=lib/sched_yield.c
+  tests=lib/select.c
   tests=lib/setenv.c
-  tests=lib/setlocale.c
-  tests=lib/strdup.c
+  tests=lib/setsockopt.c
+  tests=lib/sleep.c
+  tests=lib/socket.c
+  tests=lib/sockets.c
+  tests=lib/sockets.h
+  tests=lib/strerror_r.c
   tests=lib/symlink.c
+  tests=lib/sys_ioctl.in.h
+  tests=lib/sys_select.in.h
+  tests=lib/sys_socket.c
+  tests=lib/sys_socket.in.h
+  tests=lib/sys_time.in.h
+  tests=lib/sys_uio.in.h
+  tests=lib/uinttostr.c
+  tests=lib/umaxtostr.c
   tests=lib/unsetenv.c
+  tests=lib/unused-parameter.h
+  tests=lib/vma-iter.c
+  tests=lib/vma-iter.h
+  tests=lib/w32sock.h
+  tests=lib/warn-on-use.h
   tests=lib/wctob.c
   tests=lib/wctomb-impl.h
   tests=lib/wctomb.c
+  tests=lib/windows-thread.c
+  tests=lib/windows-thread.h
+  tests=lib/write.c
+  tests=lib/xconcat-filename.c
   top/GNUmakefile
   top/maint.mk
 ])