Sync with the latest Gnulib code (177f525)

Signed-off-by: Thomas Guyot-Sionnest <dermoth@aei.ca>

1 files changed, 609 insertions, 152 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 87fe0316..e2dc38b7 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -1,6 +1,6 @@
 ## DO NOT EDIT! GENERATED AUTOMATICALLY!
 ## Process this file with automake to produce Makefile.in.
-# Copyright (C) 2002-2009 Free Software Foundation, Inc.
+# Copyright (C) 2002-2010 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
@@ -62,9 +62,10 @@ BUILT_SOURCES += $(ALLOCA_H)
 # We need the following in order to create <alloca.h> when the system
 # doesn't have one that works with the given compiler.
 alloca.h: alloca.in.h
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           cat $(srcdir)/alloca.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv -f $@-t $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
@@ -72,15 +73,39 @@ EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
+## begin gnulib module arg-nonnull
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += arg-nonnull.h
+# The arg-nonnull.h that gets inserted into generated .h files is the same as
+# build-aux/arg-nonnull.h, except that it has the copyright header cut off.
+arg-nonnull.h: $(top_srcdir)/build-aux/arg-nonnull.h
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        sed -n -e '/GL_ARG_NONNULL/,$$p' \
+          < $(top_srcdir)/build-aux/arg-nonnull.h \
+          > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += arg-nonnull.h arg-nonnull.h-t
+
+ARG_NONNULL_H=arg-nonnull.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/arg-nonnull.h
+
+## end   gnulib module arg-nonnull
+
 ## begin gnulib module arpa_inet
 
-BUILT_SOURCES += $(ARPA_INET_H)
+BUILT_SOURCES += arpa/inet.h
 
 # We need the following in order to create <arpa/inet.h> when the system
 # doesn't have one.
-arpa/inet.h: arpa_inet.in.h
-        @MKDIR_P@ arpa
-        rm -f $@-t $@
+arpa/inet.h: arpa_inet.in.h $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+        $(AM_V_at)$(MKDIR_P) arpa
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -90,9 +115,10 @@ arpa/inet.h: arpa_inet.in.h
               -e 's|@''GNULIB_INET_PTON''@|$(GNULIB_INET_PTON)|g' \
               -e 's|@''HAVE_DECL_INET_NTOP''@|$(HAVE_DECL_INET_NTOP)|g' \
               -e 's|@''HAVE_DECL_INET_PTON''@|$(HAVE_DECL_INET_PTON)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/arpa_inet.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
 MOSTLYCLEANDIRS += arpa
@@ -116,6 +142,30 @@ EXTRA_libgnu_a_SOURCES += btowc.c
 
 ## end   gnulib module btowc
 
+## begin gnulib module c++defs
+
+# The BUILT_SOURCES created by this Makefile snippet are not used via #include
+# statements but through direct file reference. Therefore this snippet must be
+# present in all Makefile.am that need it. This is ensured by the applicability
+# 'all' defined above.
+
+BUILT_SOURCES += c++defs.h
+# The c++defs.h that gets inserted into generated .h files is the same as
+# build-aux/c++defs.h, except that it has the copyright header cut off.
+c++defs.h: $(top_srcdir)/build-aux/c++defs.h
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        sed -n -e '/_GL_CXXDEFS/,$$p' \
+          < $(top_srcdir)/build-aux/c++defs.h \
+          > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += c++defs.h c++defs.h-t
+
+CXXDEFS_H=c++defs.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/c++defs.h
+
+## end   gnulib module c++defs
+
 ## begin gnulib module c-strtod
 
 
@@ -134,6 +184,14 @@ EXTRA_libgnu_a_SOURCES += cloexec.c
 
 ## end   gnulib module cloexec
 
+## begin gnulib module close-hook
+
+libgnu_a_SOURCES += close-hook.c
+
+EXTRA_DIST += close-hook.h
+
+## end   gnulib module close-hook
+
 ## begin gnulib module configmake
 
 # Retrieve values of the variables through 'configure' followed by
@@ -154,7 +212,7 @@ EXTRA_libgnu_a_SOURCES += cloexec.c
 # The Automake-defined pkg* macros are appended, in the order
 # listed in the Automake 1.10a+ documentation.
 configmake.h: Makefile
-        rm -f $@-t
+        $(AM_V_GEN)rm -f $@-t && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           echo '#define PREFIX "$(prefix)"'; \
           echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@@ -183,7 +241,7 @@ configmake.h: Makefile
           echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
           echo '#define PKGLIBDIR "$(pkglibdir)"'; \
           echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
-        } | sed '/""/d' > $@-t
+        } | sed '/""/d' > $@-t && \
         if test -f $@ && cmp $@-t $@ > /dev/null; then \
           rm -f $@-t; \
         else \
@@ -198,12 +256,30 @@ CLEANFILES += configmake.h configmake.h-t
 ## begin gnulib module dirname
 
 
-EXTRA_DIST += basename.c dirname.c dirname.h stripslash.c
+EXTRA_DIST += basename.c dirname.c stripslash.c
 
 EXTRA_libgnu_a_SOURCES += basename.c dirname.c stripslash.c
 
 ## end   gnulib module dirname
 
+## begin gnulib module dirname-lgpl
+
+
+EXTRA_DIST += basename-lgpl.c dirname-lgpl.c dirname.h stripslash.c
+
+EXTRA_libgnu_a_SOURCES += basename-lgpl.c dirname-lgpl.c stripslash.c
+
+## end   gnulib module dirname-lgpl
+
+## begin gnulib module dup2
+
+
+EXTRA_DIST += dup2.c
+
+EXTRA_libgnu_a_SOURCES += dup2.c
+
+## end   gnulib module dup2
+
 ## begin gnulib module errno
 
 BUILT_SOURCES += $(ERRNO_H)
@@ -211,7 +287,7 @@ BUILT_SOURCES += $(ERRNO_H)
 # We need the following in order to create <errno.h> when the system
 # doesn't have one that is POSIX compliant.
 errno.h: errno.in.h
-        rm -f $@-t $@
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -223,7 +299,7 @@ errno.h: errno.in.h
               -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
               -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
               < $(srcdir)/errno.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += errno.h errno.h-t
 
@@ -242,35 +318,52 @@ EXTRA_libgnu_a_SOURCES += error.c
 
 ## begin gnulib module exitfail
 
+libgnu_a_SOURCES += exitfail.c
 
-EXTRA_DIST += exitfail.c exitfail.h
-
-EXTRA_libgnu_a_SOURCES += exitfail.c
+EXTRA_DIST += exitfail.h
 
 ## end   gnulib module exitfail
 
 ## begin gnulib module fcntl
 
-BUILT_SOURCES += $(FCNTL_H)
+
+EXTRA_DIST += fcntl.c
+
+EXTRA_libgnu_a_SOURCES += fcntl.c
+
+## end   gnulib module fcntl
+
+## begin gnulib module fcntl-h
+
+BUILT_SOURCES += fcntl.h
 
 # We need the following in order to create <fcntl.h> when the system
 # doesn't have one that works with the given compiler.
-fcntl.h: fcntl.in.h
-        rm -f $@-t $@
+fcntl.h: fcntl.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_FCNTL_H''@|$(NEXT_FCNTL_H)|g' \
+              -e 's|@''GNULIB_FCNTL''@|$(GNULIB_FCNTL)|g' \
               -e 's|@''GNULIB_OPEN''@|$(GNULIB_OPEN)|g' \
+              -e 's|@''GNULIB_OPENAT''@|$(GNULIB_OPENAT)|g' \
+              -e 's|@''HAVE_FCNTL''@|$(HAVE_FCNTL)|g' \
+              -e 's|@''HAVE_OPENAT''@|$(HAVE_OPENAT)|g' \
+              -e 's|@''REPLACE_FCNTL''@|$(REPLACE_FCNTL)|g' \
               -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+              -e 's|@''REPLACE_OPENAT''@|$(REPLACE_OPENAT)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/fcntl.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += fcntl.h fcntl.h-t
 
 EXTRA_DIST += fcntl.in.h
 
-## end   gnulib module fcntl
+## end   gnulib module fcntl-h
 
 ## begin gnulib module fcntl-safer
 
@@ -288,13 +381,13 @@ BUILT_SOURCES += $(FLOAT_H)
 # We need the following in order to create <float.h> when the system
 # doesn't have one that works with the given compiler.
 float.h: float.in.h
-        rm -f $@-t $@
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
               < $(srcdir)/float.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += float.h float.h-t
 
@@ -341,10 +434,19 @@ EXTRA_libgnu_a_SOURCES += gai_strerror.c getaddrinfo.c
 
 ## end   gnulib module getaddrinfo
 
+## begin gnulib module getdtablesize
+
+
+EXTRA_DIST += getdtablesize.c
+
+EXTRA_libgnu_a_SOURCES += getdtablesize.c
+
+## end   gnulib module getdtablesize
+
 ## begin gnulib module gethostname
 
 
-EXTRA_DIST += gethostname.c
+EXTRA_DIST += gethostname.c w32sock.h
 
 EXTRA_libgnu_a_SOURCES += gethostname.c
 
@@ -359,16 +461,22 @@ EXTRA_libgnu_a_SOURCES += getloadavg.c
 
 ## end   gnulib module getloadavg
 
-## begin gnulib module getopt
+## begin gnulib module getopt-posix
 
 BUILT_SOURCES += $(GETOPT_H)
 
 # We need the following in order to create <getopt.h> when the system
 # doesn't have one that works with the given compiler.
-getopt.h: getopt.in.h
+getopt.h: getopt.in.h $(ARG_NONNULL_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          cat $(srcdir)/getopt.in.h; \
-        } > $@-t
+          sed -e 's|@''HAVE_GETOPT_H''@|$(HAVE_GETOPT_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_GETOPT_H''@|$(NEXT_GETOPT_H)|g' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              < $(srcdir)/getopt.in.h; \
+        } > $@-t && \
         mv -f $@-t $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
@@ -376,7 +484,7 @@ EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
 
 EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
-## end   gnulib module getopt
+## end   gnulib module getopt-posix
 
 ## begin gnulib module gettext
 
@@ -423,13 +531,34 @@ EXTRA_DIST += intprops.h
 
 ## end   gnulib module intprops
 
-## begin gnulib module link-warning
+## begin gnulib module langinfo
 
-LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
+BUILT_SOURCES += langinfo.h
 
-EXTRA_DIST += $(top_srcdir)/build-aux/link-warning.h
+# We need the following in order to create an empty placeholder for
+# <langinfo.h> when the system doesn't have one.
+langinfo.h: langinfo.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''HAVE_LANGINFO_H''@|$(HAVE_LANGINFO_H)|g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_LANGINFO_H''@|$(NEXT_LANGINFO_H)|g' \
+              -e 's|@''GNULIB_NL_LANGINFO''@|$(GNULIB_NL_LANGINFO)|g' \
+              -e 's|@''HAVE_LANGINFO_CODESET''@|$(HAVE_LANGINFO_CODESET)|g' \
+              -e 's|@''HAVE_LANGINFO_ERA''@|$(HAVE_LANGINFO_ERA)|g' \
+              -e 's|@''HAVE_NL_LANGINFO''@|$(HAVE_NL_LANGINFO)|g' \
+              -e 's|@''REPLACE_NL_LANGINFO''@|$(REPLACE_NL_LANGINFO)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              < $(srcdir)/langinfo.in.h; \
+        } > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += langinfo.h langinfo.h-t
+
+EXTRA_DIST += langinfo.in.h
 
-## end   gnulib module link-warning
+## end   gnulib module langinfo
 
 ## begin gnulib module localcharset
 
@@ -489,14 +618,14 @@ uninstall-localcharset: all-local
         fi
 
 charset.alias: config.charset
-        rm -f t-$@ $@
-        $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
+        $(AM_V_GEN)rm -f t-$@ $@ && \
+        $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@ && \
         mv t-$@ $@
 
 SUFFIXES += .sed .sin
 .sin.sed:
-        rm -f t-$@ $@
-        sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
+        $(AM_V_GEN)rm -f t-$@ $@ && \
+        sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@ && \
         mv t-$@ $@
 
 CLEANFILES += charset.alias ref-add.sed ref-del.sed
@@ -505,6 +634,34 @@ EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 
 ## end   gnulib module localcharset
 
+## begin gnulib module locale
+
+BUILT_SOURCES += locale.h
+
+# We need the following in order to create <locale.h> when the system
+# doesn't have one that provides all definitions.
+locale.h: locale.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_LOCALE_H''@|$(NEXT_LOCALE_H)|g' \
+              -e 's|@''GNULIB_DUPLOCALE''@|$(GNULIB_DUPLOCALE)|g' \
+              -e 's|@''HAVE_DUPLOCALE''@|$(HAVE_DUPLOCALE)|g' \
+              -e 's|@''HAVE_XLOCALE_H''@|$(HAVE_XLOCALE_H)|g' \
+              -e 's|@''REPLACE_DUPLOCALE''@|$(REPLACE_DUPLOCALE)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              < $(srcdir)/locale.in.h; \
+        } > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += locale.h locale.h-t
+
+EXTRA_DIST += locale.in.h
+
+## end   gnulib module locale
+
 ## begin gnulib module malloc
 
 
@@ -529,14 +686,19 @@ BUILT_SOURCES += math.h
 
 # We need the following in order to create <math.h> when the system
 # doesn't have one that works with the given compiler.
-math.h: math.in.h
-        rm -f $@-t $@
+math.h: math.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT_AS_FIRST_DIRECTIVE''@|$(INCLUDE_NEXT_AS_FIRST_DIRECTIVE)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-              -e 's|@''NEXT_MATH_H''@|$(NEXT_MATH_H)|g' \
+              -e 's|@''NEXT_AS_FIRST_DIRECTIVE_MATH_H''@|$(NEXT_AS_FIRST_DIRECTIVE_MATH_H)|g' \
+              -e 's|@''GNULIB_ACOSL''@|$(GNULIB_ACOSL)|g' \
+              -e 's|@''GNULIB_ASINL''@|$(GNULIB_ASINL)|g' \
+              -e 's|@''GNULIB_ATANL''@|$(GNULIB_ATANL)|g' \
               -e 's|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
               -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \
+              -e 's|@''GNULIB_COSL''@|$(GNULIB_COSL)|g' \
+              -e 's|@''GNULIB_EXPL''@|$(GNULIB_EXPL)|g' \
               -e 's|@''GNULIB_FLOORF''@|$(GNULIB_FLOORF)|g' \
               -e 's|@''GNULIB_FLOORL''@|$(GNULIB_FLOORL)|g' \
               -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
@@ -548,30 +710,52 @@ math.h: math.in.h
               -e 's|@''GNULIB_ISNAND''@|$(GNULIB_ISNAND)|g' \
               -e 's|@''GNULIB_ISNANL''@|$(GNULIB_ISNANL)|g' \
               -e 's|@''GNULIB_LDEXPL''@|$(GNULIB_LDEXPL)|g' \
-              -e 's|@''GNULIB_MATHL''@|$(GNULIB_MATHL)|g' \
+              -e 's|@''GNULIB_LOGB''@|$(GNULIB_LOGB)|g' \
+              -e 's|@''GNULIB_LOGL''@|$(GNULIB_LOGL)|g' \
               -e 's|@''GNULIB_ROUND''@|$(GNULIB_ROUND)|g' \
               -e 's|@''GNULIB_ROUNDF''@|$(GNULIB_ROUNDF)|g' \
               -e 's|@''GNULIB_ROUNDL''@|$(GNULIB_ROUNDL)|g' \
               -e 's|@''GNULIB_SIGNBIT''@|$(GNULIB_SIGNBIT)|g' \
+              -e 's|@''GNULIB_SINL''@|$(GNULIB_SINL)|g' \
+              -e 's|@''GNULIB_SQRTL''@|$(GNULIB_SQRTL)|g' \
+              -e 's|@''GNULIB_TANL''@|$(GNULIB_TANL)|g' \
               -e 's|@''GNULIB_TRUNC''@|$(GNULIB_TRUNC)|g' \
               -e 's|@''GNULIB_TRUNCF''@|$(GNULIB_TRUNCF)|g' \
               -e 's|@''GNULIB_TRUNCL''@|$(GNULIB_TRUNCL)|g' \
+              -e 's|@''HAVE_ACOSL''@|$(HAVE_ACOSL)|g' \
+              -e 's|@''HAVE_ASINL''@|$(HAVE_ASINL)|g' \
+              -e 's|@''HAVE_ATANL''@|$(HAVE_ATANL)|g' \
+              -e 's|@''HAVE_COSL''@|$(HAVE_COSL)|g' \
+              -e 's|@''HAVE_EXPL''@|$(HAVE_EXPL)|g' \
               -e 's|@''HAVE_ISNANF''@|$(HAVE_ISNANF)|g' \
               -e 's|@''HAVE_ISNAND''@|$(HAVE_ISNAND)|g' \
               -e 's|@''HAVE_ISNANL''@|$(HAVE_ISNANL)|g' \
+              -e 's|@''HAVE_LOGL''@|$(HAVE_LOGL)|g' \
+              -e 's|@''HAVE_SINL''@|$(HAVE_SINL)|g' \
+              -e 's|@''HAVE_SQRTL''@|$(HAVE_SQRTL)|g' \
+              -e 's|@''HAVE_TANL''@|$(HAVE_TANL)|g' \
               -e 's|@''HAVE_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
               -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
               -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
+              -e 's|@''HAVE_DECL_CEILF''@|$(HAVE_DECL_CEILF)|g' \
+              -e 's|@''HAVE_DECL_CEILL''@|$(HAVE_DECL_CEILL)|g' \
               -e 's|@''HAVE_DECL_COSL''@|$(HAVE_DECL_COSL)|g' \
               -e 's|@''HAVE_DECL_EXPL''@|$(HAVE_DECL_EXPL)|g' \
+              -e 's|@''HAVE_DECL_FLOORF''@|$(HAVE_DECL_FLOORF)|g' \
+              -e 's|@''HAVE_DECL_FLOORL''@|$(HAVE_DECL_FLOORL)|g' \
               -e 's|@''HAVE_DECL_FREXPL''@|$(HAVE_DECL_FREXPL)|g' \
               -e 's|@''HAVE_DECL_LDEXPL''@|$(HAVE_DECL_LDEXPL)|g' \
+              -e 's|@''HAVE_DECL_LOGB''@|$(HAVE_DECL_LOGB)|g' \
               -e 's|@''HAVE_DECL_LOGL''@|$(HAVE_DECL_LOGL)|g' \
+              -e 's|@''HAVE_DECL_ROUND''@|$(HAVE_DECL_ROUND)|g' \
+              -e 's|@''HAVE_DECL_ROUNDF''@|$(HAVE_DECL_ROUNDF)|g' \
+              -e 's|@''HAVE_DECL_ROUNDL''@|$(HAVE_DECL_ROUNDL)|g' \
               -e 's|@''HAVE_DECL_SINL''@|$(HAVE_DECL_SINL)|g' \
               -e 's|@''HAVE_DECL_SQRTL''@|$(HAVE_DECL_SQRTL)|g' \
               -e 's|@''HAVE_DECL_TANL''@|$(HAVE_DECL_TANL)|g' \
               -e 's|@''HAVE_DECL_TRUNC''@|$(HAVE_DECL_TRUNC)|g' \
               -e 's|@''HAVE_DECL_TRUNCF''@|$(HAVE_DECL_TRUNCF)|g' \
+              -e 's|@''HAVE_DECL_TRUNCL''@|$(HAVE_DECL_TRUNCL)|g' \
               -e 's|@''REPLACE_CEILF''@|$(REPLACE_CEILF)|g' \
               -e 's|@''REPLACE_CEILL''@|$(REPLACE_CEILL)|g' \
               -e 's|@''REPLACE_FLOORF''@|$(REPLACE_FLOORF)|g' \
@@ -590,9 +774,11 @@ math.h: math.in.h
               -e 's|@''REPLACE_SIGNBIT''@|$(REPLACE_SIGNBIT)|g' \
               -e 's|@''REPLACE_SIGNBIT_USING_GCC''@|$(REPLACE_SIGNBIT_USING_GCC)|g' \
               -e 's|@''REPLACE_TRUNCL''@|$(REPLACE_TRUNCL)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/math.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += math.h math.h-t
 
@@ -618,10 +804,19 @@ EXTRA_libgnu_a_SOURCES += mbsinit.c
 
 ## end   gnulib module mbsinit
 
+## begin gnulib module memchr
+
+
+EXTRA_DIST += memchr.c memchr.valgrind
+
+EXTRA_libgnu_a_SOURCES += memchr.c
+
+## end   gnulib module memchr
+
 ## begin gnulib module mktime
 
 
-EXTRA_DIST += mktime.c
+EXTRA_DIST += mktime-internal.h mktime.c
 
 EXTRA_libgnu_a_SOURCES += mktime.c
 
@@ -642,8 +837,8 @@ BUILT_SOURCES += $(NETDB_H)
 
 # We need the following in order to create <netdb.h> when the system
 # doesn't have one that works with the given compiler.
-netdb.h: netdb.in.h
-        rm -f $@-t $@
+netdb.h: netdb.in.h $(ARG_NONNULL_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -655,8 +850,9 @@ netdb.h: netdb.in.h
               -e 's|@''HAVE_DECL_GAI_STRERROR''@|$(HAVE_DECL_GAI_STRERROR)|g' \
               -e 's|@''HAVE_DECL_GETADDRINFO''@|$(HAVE_DECL_GETADDRINFO)|g' \
               -e 's|@''HAVE_DECL_GETNAMEINFO''@|$(HAVE_DECL_GETNAMEINFO)|g' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
               < $(srcdir)/netdb.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += netdb.h netdb.h-t
 
@@ -671,15 +867,15 @@ BUILT_SOURCES += $(NETINET_IN_H)
 # We need the following in order to create <netinet/in.h> when the system
 # doesn't have one.
 netinet/in.h: netinet_in.in.h
-        @MKDIR_P@ netinet
-        rm -f $@-t $@
+        $(AM_V_at)$(MKDIR_P) netinet
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_NETINET_IN_H''@|$(NEXT_NETINET_IN_H)|g' \
               -e 's|@''HAVE_NETINET_IN_H''@|$(HAVE_NETINET_IN_H)|g' \
               < $(srcdir)/netinet_in.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
 MOSTLYCLEANDIRS += netinet
@@ -688,6 +884,15 @@ EXTRA_DIST += netinet_in.in.h
 
 ## end   gnulib module netinet_in
 
+## begin gnulib module nl_langinfo
+
+
+EXTRA_DIST += nl_langinfo.c
+
+EXTRA_libgnu_a_SOURCES += nl_langinfo.c
+
+## end   gnulib module nl_langinfo
+
 ## begin gnulib module open
 
 
@@ -739,6 +944,23 @@ EXTRA_libgnu_a_SOURCES += snprintf.c
 
 ## end   gnulib module snprintf
 
+## begin gnulib module sockets
+
+libgnu_a_SOURCES += sockets.h sockets.c
+
+EXTRA_DIST += w32sock.h
+
+## end   gnulib module sockets
+
+## begin gnulib module stat
+
+
+EXTRA_DIST += stat.c
+
+EXTRA_libgnu_a_SOURCES += stat.c
+
+## end   gnulib module stat
+
 ## begin gnulib module stdbool
 
 BUILT_SOURCES += $(STDBOOL_H)
@@ -746,10 +968,10 @@ BUILT_SOURCES += $(STDBOOL_H)
 # We need the following in order to create <stdbool.h> when the system
 # doesn't have one that works.
 stdbool.h: stdbool.in.h
-        rm -f $@-t $@
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
@@ -757,6 +979,29 @@ EXTRA_DIST += stdbool.in.h
 
 ## end   gnulib module stdbool
 
+## begin gnulib module stddef
+
+BUILT_SOURCES += $(STDDEF_H)
+
+# We need the following in order to create <stddef.h> when the system
+# doesn't have one that works with the given compiler.
+stddef.h: stddef.in.h
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_STDDEF_H''@|$(NEXT_STDDEF_H)|g' \
+              -e 's|@''HAVE_WCHAR_T''@|$(HAVE_WCHAR_T)|g' \
+              -e 's|@''REPLACE_NULL''@|$(REPLACE_NULL)|g' \
+              < $(srcdir)/stddef.in.h; \
+        } > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += stddef.h stddef.h-t
+
+EXTRA_DIST += stddef.in.h
+
+## end   gnulib module stddef
+
 ## begin gnulib module stdint
 
 BUILT_SOURCES += $(STDINT_H)
@@ -764,7 +1009,7 @@ BUILT_SOURCES += $(STDINT_H)
 # We need the following in order to create <stdint.h> when the system
 # doesn't have one that works with the given compiler.
 stdint.h: stdint.in.h
-        rm -f $@-t $@
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -791,7 +1036,7 @@ stdint.h: stdint.in.h
               -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
               -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
               < $(srcdir)/stdint.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
@@ -805,81 +1050,100 @@ BUILT_SOURCES += stdio.h
 
 # We need the following in order to create <stdio.h> when the system
 # doesn't have one that works with the given compiler.
-stdio.h: stdio.in.h
-        rm -f $@-t $@
+stdio.h: stdio.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
-              -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
-              -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
-              -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
-              -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
-              -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
-              -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
-              -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
-              -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
-              -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
-              -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
-              -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
-              -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
               -e 's|@''GNULIB_DPRINTF''@|$(GNULIB_DPRINTF)|g' \
-              -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
-              -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
-              -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
-              -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
+              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
               -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|g' \
+              -e 's|@''GNULIB_FPRINTF''@|$(GNULIB_FPRINTF)|g' \
+              -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_FPURGE''@|$(GNULIB_FPURGE)|g' \
+              -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
+              -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
               -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
               -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
               -e 's|@''GNULIB_FSEEKO''@|$(GNULIB_FSEEKO)|g' \
               -e 's|@''GNULIB_FTELL''@|$(GNULIB_FTELL)|g' \
               -e 's|@''GNULIB_FTELLO''@|$(GNULIB_FTELLO)|g' \
-              -e 's|@''GNULIB_FFLUSH''@|$(GNULIB_FFLUSH)|g' \
-              -e 's|@''GNULIB_FCLOSE''@|$(GNULIB_FCLOSE)|g' \
-              -e 's|@''GNULIB_FPUTC''@|$(GNULIB_FPUTC)|g' \
-              -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
-              -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
-              -e 's|@''GNULIB_FPUTS''@|$(GNULIB_FPUTS)|g' \
-              -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
               -e 's|@''GNULIB_FWRITE''@|$(GNULIB_FWRITE)|g' \
               -e 's|@''GNULIB_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
               -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF''@|$(GNULIB_OBSTACK_PRINTF)|g' \
+              -e 's|@''GNULIB_OBSTACK_PRINTF_POSIX''@|$(GNULIB_OBSTACK_PRINTF_POSIX)|g' \
               -e 's|@''GNULIB_PERROR''@|$(GNULIB_PERROR)|g' \
+              -e 's|@''GNULIB_POPEN''@|$(GNULIB_POPEN)|g' \
+              -e 's|@''GNULIB_PRINTF''@|$(GNULIB_PRINTF)|g' \
+              -e 's|@''GNULIB_PRINTF_POSIX''@|$(GNULIB_PRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_PUTC''@|$(GNULIB_PUTC)|g' \
+              -e 's|@''GNULIB_PUTCHAR''@|$(GNULIB_PUTCHAR)|g' \
+              -e 's|@''GNULIB_PUTS''@|$(GNULIB_PUTS)|g' \
+              -e 's|@''GNULIB_REMOVE''@|$(GNULIB_REMOVE)|g' \
+              -e 's|@''GNULIB_RENAME''@|$(GNULIB_RENAME)|g' \
+              -e 's|@''GNULIB_RENAMEAT''@|$(GNULIB_RENAMEAT)|g' \
+              -e 's|@''GNULIB_SNPRINTF''@|$(GNULIB_SNPRINTF)|g' \
+              -e 's|@''GNULIB_SPRINTF_POSIX''@|$(GNULIB_SPRINTF_POSIX)|g' \
               -e 's|@''GNULIB_STDIO_H_SIGPIPE''@|$(GNULIB_STDIO_H_SIGPIPE)|g' \
-              -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
-              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
-              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
-              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
-              -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
-              -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
+              -e 's|@''GNULIB_TMPFILE''@|$(GNULIB_TMPFILE)|g' \
+              -e 's|@''GNULIB_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+              -e 's|@''GNULIB_VDPRINTF''@|$(GNULIB_VDPRINTF)|g' \
+              -e 's|@''GNULIB_VFPRINTF''@|$(GNULIB_VFPRINTF)|g' \
+              -e 's|@''GNULIB_VFPRINTF_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_VPRINTF''@|$(GNULIB_VPRINTF)|g' \
+              -e 's|@''GNULIB_VPRINTF_POSIX''@|$(GNULIB_VPRINTF_POSIX)|g' \
+              -e 's|@''GNULIB_VSNPRINTF''@|$(GNULIB_VSNPRINTF)|g' \
+              -e 's|@''GNULIB_VSPRINTF_POSIX''@|$(GNULIB_VSPRINTF_POSIX)|g' \
+              < $(srcdir)/stdio.in.h | \
+          sed -e 's|@''HAVE_DECL_FPURGE''@|$(HAVE_DECL_FPURGE)|g' \
+              -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+              -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
               -e 's|@''HAVE_DECL_SNPRINTF''@|$(HAVE_DECL_SNPRINTF)|g' \
-              -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
               -e 's|@''HAVE_DECL_VSNPRINTF''@|$(HAVE_DECL_VSNPRINTF)|g' \
-              -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
-              -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
               -e 's|@''HAVE_DPRINTF''@|$(HAVE_DPRINTF)|g' \
-              -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
-              -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
-              -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
+              -e 's|@''HAVE_FSEEKO''@|$(HAVE_FSEEKO)|g' \
+              -e 's|@''HAVE_FTELLO''@|$(HAVE_FTELLO)|g' \
+              -e 's|@''HAVE_RENAMEAT''@|$(HAVE_RENAMEAT)|g' \
               -e 's|@''HAVE_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
-              -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
-              -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
-              -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
+              -e 's|@''HAVE_VDPRINTF''@|$(HAVE_VDPRINTF)|g' \
+              -e 's|@''REPLACE_DPRINTF''@|$(REPLACE_DPRINTF)|g' \
+              -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
+              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
               -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
+              -e 's|@''REPLACE_FPRINTF''@|$(REPLACE_FPRINTF)|g' \
+              -e 's|@''REPLACE_FPURGE''@|$(REPLACE_FPURGE)|g' \
               -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
-              -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
               -e 's|@''REPLACE_FSEEK''@|$(REPLACE_FSEEK)|g' \
-              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
+              -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
               -e 's|@''REPLACE_FTELL''@|$(REPLACE_FTELL)|g' \
-              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
-              -e 's|@''REPLACE_FCLOSE''@|$(REPLACE_FCLOSE)|g' \
-              -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
-              -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|g' \
+              -e 's|@''REPLACE_GETDELIM''@|$(REPLACE_GETDELIM)|g' \
               -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
+              -e 's|@''REPLACE_OBSTACK_PRINTF''@|$(REPLACE_OBSTACK_PRINTF)|g' \
               -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-              < $(srcdir)/stdio.in.h; \
-        } > $@-t
+              -e 's|@''REPLACE_POPEN''@|$(REPLACE_POPEN)|g' \
+              -e 's|@''REPLACE_PRINTF''@|$(REPLACE_PRINTF)|g' \
+              -e 's|@''REPLACE_REMOVE''@|$(REPLACE_REMOVE)|g' \
+              -e 's|@''REPLACE_RENAME''@|$(REPLACE_RENAME)|g' \
+              -e 's|@''REPLACE_RENAMEAT''@|$(REPLACE_RENAMEAT)|g' \
+              -e 's|@''REPLACE_SNPRINTF''@|$(REPLACE_SNPRINTF)|g' \
+              -e 's|@''REPLACE_SPRINTF''@|$(REPLACE_SPRINTF)|g' \
+              -e 's|@''REPLACE_STDIO_WRITE_FUNCS''@|$(REPLACE_STDIO_WRITE_FUNCS)|g' \
+              -e 's|@''REPLACE_TMPFILE''@|$(REPLACE_TMPFILE)|g' \
+              -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
+              -e 's|@''REPLACE_VDPRINTF''@|$(REPLACE_VDPRINTF)|g' \
+              -e 's|@''REPLACE_VFPRINTF''@|$(REPLACE_VFPRINTF)|g' \
+              -e 's|@''REPLACE_VPRINTF''@|$(REPLACE_VPRINTF)|g' \
+              -e 's|@''REPLACE_VSNPRINTF''@|$(REPLACE_VSNPRINTF)|g' \
+              -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += stdio.h stdio.h-t
 
@@ -895,36 +1159,53 @@ BUILT_SOURCES += stdlib.h
 
 # We need the following in order to create <stdlib.h> when the system
 # doesn't have one that works with the given compiler.
-stdlib.h: stdlib.in.h
-        rm -f $@-t $@
+stdlib.h: stdlib.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_H)|g' \
-              -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
-              -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
-              -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
-              -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
               -e 's|@''GNULIB_ATOLL''@|$(GNULIB_ATOLL)|g' \
+              -e 's|@''GNULIB_CALLOC_POSIX''@|$(GNULIB_CALLOC_POSIX)|g' \
+              -e 's|@''GNULIB_CANONICALIZE_FILE_NAME''@|$(GNULIB_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''GNULIB_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|g' \
               -e 's|@''GNULIB_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+              -e 's|@''GNULIB_GRANTPT''@|$(GNULIB_GRANTPT)|g' \
+              -e 's|@''GNULIB_MALLOC_POSIX''@|$(GNULIB_MALLOC_POSIX)|g' \
               -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+              -e 's|@''GNULIB_MKOSTEMP''@|$(GNULIB_MKOSTEMP)|g' \
+              -e 's|@''GNULIB_MKOSTEMPS''@|$(GNULIB_MKOSTEMPS)|g' \
               -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+              -e 's|@''GNULIB_MKSTEMPS''@|$(GNULIB_MKSTEMPS)|g' \
+              -e 's|@''GNULIB_PTSNAME''@|$(GNULIB_PTSNAME)|g' \
               -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
               -e 's|@''GNULIB_RANDOM_R''@|$(GNULIB_RANDOM_R)|g' \
+              -e 's|@''GNULIB_REALLOC_POSIX''@|$(GNULIB_REALLOC_POSIX)|g' \
+              -e 's|@''GNULIB_REALPATH''@|$(GNULIB_REALPATH)|g' \
               -e 's|@''GNULIB_RPMATCH''@|$(GNULIB_RPMATCH)|g' \
               -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
               -e 's|@''GNULIB_STRTOD''@|$(GNULIB_STRTOD)|g' \
               -e 's|@''GNULIB_STRTOLL''@|$(GNULIB_STRTOLL)|g' \
               -e 's|@''GNULIB_STRTOULL''@|$(GNULIB_STRTOULL)|g' \
+              -e 's|@''GNULIB_UNLOCKPT''@|$(GNULIB_UNLOCKPT)|g' \
               -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
               -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|g' \
               -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
+              -e 's|@''HAVE_CANONICALIZE_FILE_NAME''@|$(HAVE_CANONICALIZE_FILE_NAME)|g' \
+              -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
               -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|g' \
+              -e 's|@''HAVE_GRANTPT''@|$(HAVE_GRANTPT)|g' \
               -e 's|@''HAVE_MALLOC_POSIX''@|$(HAVE_MALLOC_POSIX)|g' \
               -e 's|@''HAVE_MKDTEMP''@|$(HAVE_MKDTEMP)|g' \
-              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
+              -e 's|@''HAVE_MKOSTEMP''@|$(HAVE_MKOSTEMP)|g' \
+              -e 's|@''HAVE_MKOSTEMPS''@|$(HAVE_MKOSTEMPS)|g' \
+              -e 's|@''HAVE_MKSTEMP''@|$(HAVE_MKSTEMP)|g' \
+              -e 's|@''HAVE_MKSTEMPS''@|$(HAVE_MKSTEMPS)|g' \
+              -e 's|@''HAVE_PTSNAME''@|$(HAVE_PTSNAME)|g' \
+              -e 's|@''HAVE_RANDOM_H''@|$(HAVE_RANDOM_H)|g' \
               -e 's|@''HAVE_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+              -e 's|@''HAVE_REALLOC_POSIX''@|$(HAVE_REALLOC_POSIX)|g' \
+              -e 's|@''HAVE_REALPATH''@|$(HAVE_REALPATH)|g' \
               -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
               -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
               -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
@@ -932,15 +1213,20 @@ stdlib.h: stdlib.in.h
               -e 's|@''HAVE_STRTOULL''@|$(HAVE_STRTOULL)|g' \
               -e 's|@''HAVE_STRUCT_RANDOM_DATA''@|$(HAVE_STRUCT_RANDOM_DATA)|g' \
               -e 's|@''HAVE_SYS_LOADAVG_H''@|$(HAVE_SYS_LOADAVG_H)|g' \
+              -e 's|@''HAVE_UNLOCKPT''@|$(HAVE_UNLOCKPT)|g' \
               -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
-              -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
+              -e 's|@''REPLACE_CANONICALIZE_FILE_NAME''@|$(REPLACE_CANONICALIZE_FILE_NAME)|g' \
               -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
               -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+              -e 's|@''REPLACE_REALPATH''@|$(REPLACE_REALPATH)|g' \
+              -e 's|@''REPLACE_SETENV''@|$(REPLACE_SETENV)|g' \
               -e 's|@''REPLACE_STRTOD''@|$(REPLACE_STRTOD)|g' \
-              -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              -e 's|@''REPLACE_UNSETENV''@|$(REPLACE_UNSETENV)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/stdlib.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
@@ -979,8 +1265,8 @@ BUILT_SOURCES += string.h
 
 # We need the following in order to create <string.h> when the system
 # doesn't have one that works with the given compiler.
-string.h: string.in.h
-        rm -f $@-t $@
+string.h: string.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -999,6 +1285,7 @@ string.h: string.in.h
               -e 's|@''GNULIB_MBSSPN''@|$(GNULIB_MBSSPN)|g' \
               -e 's|@''GNULIB_MBSSEP''@|$(GNULIB_MBSSEP)|g' \
               -e 's|@''GNULIB_MBSTOK_R''@|$(GNULIB_MBSTOK_R)|g' \
+              -e 's|@''GNULIB_MEMCHR''@|$(GNULIB_MEMCHR)|g' \
               -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
               -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
               -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
@@ -1007,6 +1294,7 @@ string.h: string.in.h
               -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
               -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
               -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+              -e 's|@''GNULIB_STRNCAT''@|$(GNULIB_STRNCAT)|g' \
               -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
               -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
               -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
@@ -1017,6 +1305,9 @@ string.h: string.in.h
               -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
               -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|g' \
               -e 's|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|g' \
+              < $(srcdir)/string.in.h | \
+          sed -e 's|@''HAVE_MBSLEN''@|$(HAVE_MBSLEN)|g' \
+              -e 's|@''HAVE_MEMCHR''@|$(HAVE_MEMCHR)|g' \
               -e 's|@''HAVE_DECL_MEMMEM''@|$(HAVE_DECL_MEMMEM)|g' \
               -e 's|@''HAVE_MEMPCPY''@|$(HAVE_MEMPCPY)|g' \
               -e 's|@''HAVE_DECL_MEMRCHR''@|$(HAVE_DECL_MEMRCHR)|g' \
@@ -1025,25 +1316,31 @@ string.h: string.in.h
               -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
               -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
               -e 's|@''HAVE_DECL_STRDUP''@|$(HAVE_DECL_STRDUP)|g' \
-              -e 's|@''HAVE_STRNDUP''@|$(HAVE_STRNDUP)|g' \
               -e 's|@''HAVE_DECL_STRNDUP''@|$(HAVE_DECL_STRNDUP)|g' \
               -e 's|@''HAVE_DECL_STRNLEN''@|$(HAVE_DECL_STRNLEN)|g' \
               -e 's|@''HAVE_STRPBRK''@|$(HAVE_STRPBRK)|g' \
               -e 's|@''HAVE_STRSEP''@|$(HAVE_STRSEP)|g' \
               -e 's|@''HAVE_STRCASESTR''@|$(HAVE_STRCASESTR)|g' \
               -e 's|@''HAVE_DECL_STRTOK_R''@|$(HAVE_DECL_STRTOK_R)|g' \
-              -e 's|@''HAVE_DECL_STRERROR''@|$(HAVE_DECL_STRERROR)|g' \
               -e 's|@''HAVE_DECL_STRSIGNAL''@|$(HAVE_DECL_STRSIGNAL)|g' \
               -e 's|@''HAVE_STRVERSCMP''@|$(HAVE_STRVERSCMP)|g' \
+              -e 's|@''REPLACE_STPNCPY''@|$(REPLACE_STPNCPY)|g' \
+              -e 's|@''REPLACE_MEMCHR''@|$(REPLACE_MEMCHR)|g' \
               -e 's|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
               -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
               -e 's|@''REPLACE_STRDUP''@|$(REPLACE_STRDUP)|g' \
               -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
               -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
+              -e 's|@''REPLACE_STRNCAT''@|$(REPLACE_STRNCAT)|g' \
+              -e 's|@''REPLACE_STRNDUP''@|$(REPLACE_STRNDUP)|g' \
               -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              -e 's|@''REPLACE_STRTOK_R''@|$(REPLACE_STRTOK_R)|g' \
+              -e 's|@''UNDEFINE_STRTOK_R''@|$(UNDEFINE_STRTOK_R)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
               < $(srcdir)/string.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += string.h string.h-t
 
@@ -1069,14 +1366,24 @@ EXTRA_libgnu_a_SOURCES += strnlen.c
 
 ## end   gnulib module strnlen
 
+## begin gnulib module strstr-simple
+
+
+EXTRA_DIST += str-two-way.h strstr.c
+
+EXTRA_libgnu_a_SOURCES += strstr.c
+
+## end   gnulib module strstr-simple
+
 ## begin gnulib module sys_socket
 
-BUILT_SOURCES += $(SYS_SOCKET_H)
+BUILT_SOURCES += sys/socket.h
 
 # We need the following in order to create <sys/socket.h> when the system
 # doesn't have one that works with the given compiler.
-sys/socket.h: sys_socket.in.h
-        @MKDIR_P@ sys
+sys/socket.h: sys_socket.in.h $(CXXDEFS_H) $(WARN_ON_USE_H) $(ARG_NONNULL_H)
+        $(AM_V_at)$(MKDIR_P) sys
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -1097,12 +1404,17 @@ sys/socket.h: sys_socket.in.h
               -e 's|@''GNULIB_SENDTO''@|$(GNULIB_SENDTO)|g' \
               -e 's|@''GNULIB_SETSOCKOPT''@|$(GNULIB_SETSOCKOPT)|g' \
               -e 's|@''GNULIB_SHUTDOWN''@|$(GNULIB_SHUTDOWN)|g' \
+              -e 's|@''GNULIB_ACCEPT4''@|$(GNULIB_ACCEPT4)|g' \
               -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
               -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
               -e 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              -e 's|@''HAVE_SA_FAMILY_T''@|$(HAVE_SA_FAMILY_T)|g' \
+              -e 's|@''HAVE_ACCEPT4''@|$(HAVE_ACCEPT4)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/sys_socket.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv -f $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys
@@ -1111,26 +1423,96 @@ EXTRA_DIST += sys_socket.in.h
 
 ## end   gnulib module sys_socket
 
+## begin gnulib module sys_stat
+
+BUILT_SOURCES += sys/stat.h
+
+# We need the following in order to create <sys/stat.h> when the system
+# has one that is incomplete.
+sys/stat.h: sys_stat.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_at)$(MKDIR_P) sys
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_SYS_STAT_H''@|$(NEXT_SYS_STAT_H)|g' \
+              -e 's|@''GNULIB_FCHMODAT''@|$(GNULIB_FCHMODAT)|g' \
+              -e 's|@''GNULIB_FSTATAT''@|$(GNULIB_FSTATAT)|g' \
+              -e 's|@''GNULIB_FUTIMENS''@|$(GNULIB_FUTIMENS)|g' \
+              -e 's|@''GNULIB_LCHMOD''@|$(GNULIB_LCHMOD)|g' \
+              -e 's|@''GNULIB_LSTAT''@|$(GNULIB_LSTAT)|g' \
+              -e 's|@''GNULIB_MKDIRAT''@|$(GNULIB_MKDIRAT)|g' \
+              -e 's|@''GNULIB_MKFIFO''@|$(GNULIB_MKFIFO)|g' \
+              -e 's|@''GNULIB_MKFIFOAT''@|$(GNULIB_MKFIFOAT)|g' \
+              -e 's|@''GNULIB_MKNOD''@|$(GNULIB_MKNOD)|g' \
+              -e 's|@''GNULIB_MKNODAT''@|$(GNULIB_MKNODAT)|g' \
+              -e 's|@''GNULIB_STAT''@|$(GNULIB_STAT)|g' \
+              -e 's|@''GNULIB_UTIMENSAT''@|$(GNULIB_UTIMENSAT)|g' \
+              -e 's|@''HAVE_FCHMODAT''@|$(HAVE_FCHMODAT)|g' \
+              -e 's|@''HAVE_FSTATAT''@|$(HAVE_FSTATAT)|g' \
+              -e 's|@''HAVE_FUTIMENS''@|$(HAVE_FUTIMENS)|g' \
+              -e 's|@''HAVE_LCHMOD''@|$(HAVE_LCHMOD)|g' \
+              -e 's|@''HAVE_LSTAT''@|$(HAVE_LSTAT)|g' \
+              -e 's|@''HAVE_MKDIRAT''@|$(HAVE_MKDIRAT)|g' \
+              -e 's|@''HAVE_MKFIFO''@|$(HAVE_MKFIFO)|g' \
+              -e 's|@''HAVE_MKFIFOAT''@|$(HAVE_MKFIFOAT)|g' \
+              -e 's|@''HAVE_MKNOD''@|$(HAVE_MKNOD)|g' \
+              -e 's|@''HAVE_MKNODAT''@|$(HAVE_MKNODAT)|g' \
+              -e 's|@''HAVE_UTIMENSAT''@|$(HAVE_UTIMENSAT)|g' \
+              -e 's|@''REPLACE_FSTAT''@|$(REPLACE_FSTAT)|g' \
+              -e 's|@''REPLACE_FSTATAT''@|$(REPLACE_FSTATAT)|g' \
+              -e 's|@''REPLACE_FUTIMENS''@|$(REPLACE_FUTIMENS)|g' \
+              -e 's|@''REPLACE_LSTAT''@|$(REPLACE_LSTAT)|g' \
+              -e 's|@''REPLACE_MKDIR''@|$(REPLACE_MKDIR)|g' \
+              -e 's|@''REPLACE_MKFIFO''@|$(REPLACE_MKFIFO)|g' \
+              -e 's|@''REPLACE_MKNOD''@|$(REPLACE_MKNOD)|g' \
+              -e 's|@''REPLACE_STAT''@|$(REPLACE_STAT)|g' \
+              -e 's|@''REPLACE_UTIMENSAT''@|$(REPLACE_UTIMENSAT)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
+              < $(srcdir)/sys_stat.in.h; \
+        } > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += sys/stat.h sys/stat.h-t
+MOSTLYCLEANDIRS += sys
+
+EXTRA_DIST += sys_stat.in.h
+
+## end   gnulib module sys_stat
+
 ## begin gnulib module time
 
 BUILT_SOURCES += time.h
 
 # We need the following in order to create <time.h> when the system
 # doesn't have one that works with the given compiler.
-time.h: time.in.h
-        rm -f $@-t $@
+time.h: time.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
-              -e 's|@NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
-              -e 's|@REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
-              -e 's|@REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
-              -e 's|@REPLACE_STRPTIME''@|$(REPLACE_STRPTIME)|g' \
-              -e 's|@REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
-              -e 's|@SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
-              -e 's|@TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+              -e 's|@''NEXT_TIME_H''@|$(NEXT_TIME_H)|g' \
+              -e 's|@''GNULIB_MKTIME''@|$(GNULIB_MKTIME)|g' \
+              -e 's|@''GNULIB_NANOSLEEP''@|$(GNULIB_NANOSLEEP)|g' \
+              -e 's|@''GNULIB_STRPTIME''@|$(GNULIB_STRPTIME)|g' \
+              -e 's|@''GNULIB_TIMEGM''@|$(GNULIB_TIMEGM)|g' \
+              -e 's|@''GNULIB_TIME_R''@|$(GNULIB_TIME_R)|g' \
+              -e 's|@''HAVE_LOCALTIME_R''@|$(HAVE_LOCALTIME_R)|g' \
+              -e 's|@''HAVE_NANOSLEEP''@|$(HAVE_NANOSLEEP)|g' \
+              -e 's|@''HAVE_STRPTIME''@|$(HAVE_STRPTIME)|g' \
+              -e 's|@''HAVE_TIMEGM''@|$(HAVE_TIMEGM)|g' \
+              -e 's|@''REPLACE_LOCALTIME_R''@|$(REPLACE_LOCALTIME_R)|g' \
+              -e 's|@''REPLACE_MKTIME''@|$(REPLACE_MKTIME)|g' \
+              -e 's|@''REPLACE_NANOSLEEP''@|$(REPLACE_NANOSLEEP)|g' \
+              -e 's|@''REPLACE_TIMEGM''@|$(REPLACE_TIMEGM)|g' \
+              -e 's|@''SYS_TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(SYS_TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+              -e 's|@''TIME_H_DEFINES_STRUCT_TIMESPEC''@|$(TIME_H_DEFINES_STRUCT_TIMESPEC)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/time.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += time.h time.h-t
 
@@ -1150,7 +1532,7 @@ EXTRA_libgnu_a_SOURCES += time_r.c
 ## begin gnulib module timegm
 
 
-EXTRA_DIST += timegm.c
+EXTRA_DIST += mktime-internal.h timegm.c
 
 EXTRA_libgnu_a_SOURCES += timegm.c
 
@@ -1162,8 +1544,8 @@ BUILT_SOURCES += unistd.h
 
 # We need the following in order to create an empty placeholder for
 # <unistd.h> when the system doesn't have one.
-unistd.h: unistd.in.h
-        rm -f $@-t $@
+unistd.h: unistd.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
@@ -1172,53 +1554,104 @@ unistd.h: unistd.in.h
               -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
               -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
               -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+              -e 's|@''GNULIB_DUP3''@|$(GNULIB_DUP3)|g' \
               -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
               -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
+              -e 's|@''GNULIB_FACCESSAT''@|$(GNULIB_FACCESSAT)|g' \
               -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+              -e 's|@''GNULIB_FCHOWNAT''@|$(GNULIB_FCHOWNAT)|g' \
               -e 's|@''GNULIB_FSYNC''@|$(GNULIB_FSYNC)|g' \
               -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
               -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
               -e 's|@''GNULIB_GETDOMAINNAME''@|$(GNULIB_GETDOMAINNAME)|g' \
               -e 's|@''GNULIB_GETDTABLESIZE''@|$(GNULIB_GETDTABLESIZE)|g' \
+              -e 's|@''GNULIB_GETGROUPS''@|$(GNULIB_GETGROUPS)|g' \
               -e 's|@''GNULIB_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|g' \
+              -e 's|@''GNULIB_GETLOGIN''@|$(GNULIB_GETLOGIN)|g' \
               -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
               -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
               -e 's|@''GNULIB_GETUSERSHELL''@|$(GNULIB_GETUSERSHELL)|g' \
               -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
               -e 's|@''GNULIB_LINK''@|$(GNULIB_LINK)|g' \
+              -e 's|@''GNULIB_LINKAT''@|$(GNULIB_LINKAT)|g' \
               -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+              -e 's|@''GNULIB_PIPE2''@|$(GNULIB_PIPE2)|g' \
+              -e 's|@''GNULIB_PREAD''@|$(GNULIB_PREAD)|g' \
               -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+              -e 's|@''GNULIB_READLINKAT''@|$(GNULIB_READLINKAT)|g' \
+              -e 's|@''GNULIB_RMDIR''@|$(GNULIB_RMDIR)|g' \
               -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+              -e 's|@''GNULIB_SYMLINK''@|$(GNULIB_SYMLINK)|g' \
+              -e 's|@''GNULIB_SYMLINKAT''@|$(GNULIB_SYMLINKAT)|g' \
+              -e 's|@''GNULIB_TTYNAME_R''@|$(GNULIB_TTYNAME_R)|g' \
+              -e 's|@''GNULIB_UNISTD_H_GETOPT''@|$(GNULIB_UNISTD_H_GETOPT)|g' \
               -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+              -e 's|@''GNULIB_UNLINK''@|$(GNULIB_UNLINK)|g' \
+              -e 's|@''GNULIB_UNLINKAT''@|$(GNULIB_UNLINKAT)|g' \
+              -e 's|@''GNULIB_USLEEP''@|$(GNULIB_USLEEP)|g' \
               -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
+              < $(srcdir)/unistd.in.h | \
+          sed -e 's|@''HAVE_CHOWN''@|$(HAVE_CHOWN)|g' \
               -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+              -e 's|@''HAVE_DUP3''@|$(HAVE_DUP3)|g' \
               -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|g' \
+              -e 's|@''HAVE_FACCESSAT''@|$(HAVE_FACCESSAT)|g' \
+              -e 's|@''HAVE_FCHDIR''@|$(HAVE_FCHDIR)|g' \
+              -e 's|@''HAVE_FCHOWNAT''@|$(HAVE_FCHOWNAT)|g' \
               -e 's|@''HAVE_FSYNC''@|$(HAVE_FSYNC)|g' \
               -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
               -e 's|@''HAVE_GETDOMAINNAME''@|$(HAVE_GETDOMAINNAME)|g' \
               -e 's|@''HAVE_GETDTABLESIZE''@|$(HAVE_GETDTABLESIZE)|g' \
+              -e 's|@''HAVE_GETGROUPS''@|$(HAVE_GETGROUPS)|g' \
               -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
+              -e 's|@''HAVE_GETLOGIN''@|$(HAVE_GETLOGIN)|g' \
               -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
-              -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \
+              -e 's|@''HAVE_LCHOWN''@|$(HAVE_LCHOWN)|g' \
               -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
+              -e 's|@''HAVE_LINKAT''@|$(HAVE_LINKAT)|g' \
+              -e 's|@''HAVE_PIPE2''@|$(HAVE_PIPE2)|g' \
+              -e 's|@''HAVE_PREAD''@|$(HAVE_PREAD)|g' \
               -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+              -e 's|@''HAVE_READLINKAT''@|$(HAVE_READLINKAT)|g' \
               -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+              -e 's|@''HAVE_SYMLINK''@|$(HAVE_SYMLINK)|g' \
+              -e 's|@''HAVE_SYMLINKAT''@|$(HAVE_SYMLINKAT)|g' \
+              -e 's|@''HAVE_TTYNAME_R''@|$(HAVE_TTYNAME_R)|g' \
+              -e 's|@''HAVE_UNLINKAT''@|$(HAVE_UNLINKAT)|g' \
+              -e 's|@''HAVE_USLEEP''@|$(HAVE_USLEEP)|g' \
               -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
               -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|g' \
+              -e 's|@''HAVE_DECL_GETPAGESIZE''@|$(HAVE_DECL_GETPAGESIZE)|g' \
+              -e 's|@''HAVE_DECL_GETUSERSHELL''@|$(HAVE_DECL_GETUSERSHELL)|g' \
               -e 's|@''HAVE_OS_H''@|$(HAVE_OS_H)|g' \
               -e 's|@''HAVE_SYS_PARAM_H''@|$(HAVE_SYS_PARAM_H)|g' \
               -e 's|@''REPLACE_CHOWN''@|$(REPLACE_CHOWN)|g' \
               -e 's|@''REPLACE_CLOSE''@|$(REPLACE_CLOSE)|g' \
-              -e 's|@''REPLACE_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
+              -e 's|@''REPLACE_DUP''@|$(REPLACE_DUP)|g' \
+              -e 's|@''REPLACE_DUP2''@|$(REPLACE_DUP2)|g' \
+              -e 's|@''REPLACE_FCHOWNAT''@|$(REPLACE_FCHOWNAT)|g' \
               -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+              -e 's|@''REPLACE_GETGROUPS''@|$(REPLACE_GETGROUPS)|g' \
               -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
               -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+              -e 's|@''REPLACE_LINK''@|$(REPLACE_LINK)|g' \
+              -e 's|@''REPLACE_LINKAT''@|$(REPLACE_LINKAT)|g' \
               -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+              -e 's|@''REPLACE_PREAD''@|$(REPLACE_PREAD)|g' \
+              -e 's|@''REPLACE_READLINK''@|$(REPLACE_READLINK)|g' \
+              -e 's|@''REPLACE_RMDIR''@|$(REPLACE_RMDIR)|g' \
+              -e 's|@''REPLACE_SLEEP''@|$(REPLACE_SLEEP)|g' \
+              -e 's|@''REPLACE_SYMLINK''@|$(REPLACE_SYMLINK)|g' \
+              -e 's|@''REPLACE_UNLINK''@|$(REPLACE_UNLINK)|g' \
+              -e 's|@''REPLACE_UNLINKAT''@|$(REPLACE_UNLINKAT)|g' \
+              -e 's|@''REPLACE_USLEEP''@|$(REPLACE_USLEEP)|g' \
               -e 's|@''REPLACE_WRITE''@|$(REPLACE_WRITE)|g' \
               -e 's|@''UNISTD_H_HAVE_WINSOCK2_H''@|$(UNISTD_H_HAVE_WINSOCK2_H)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
-              < $(srcdir)/unistd.in.h; \
-        } > $@-t
+              -e 's|@''UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS''@|$(UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS)|g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)'; \
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += unistd.h unistd.h-t
 
@@ -1268,14 +1701,33 @@ EXTRA_libgnu_a_SOURCES += vsnprintf.c
 
 ## end   gnulib module vsnprintf
 
+## begin gnulib module warn-on-use
+
+BUILT_SOURCES += warn-on-use.h
+# The warn-on-use.h that gets inserted into generated .h files is the same as
+# build-aux/warn-on-use.h, except that it has the copyright header cut off.
+warn-on-use.h: $(top_srcdir)/build-aux/warn-on-use.h
+        $(AM_V_GEN)rm -f $@-t $@ && \
+        sed -n -e '/^.ifndef/,$$p' \
+          < $(top_srcdir)/build-aux/warn-on-use.h \
+          > $@-t && \
+        mv $@-t $@
+MOSTLYCLEANFILES += warn-on-use.h warn-on-use.h-t
+
+WARN_ON_USE_H=warn-on-use.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/warn-on-use.h
+
+## end   gnulib module warn-on-use
+
 ## begin gnulib module wchar
 
-BUILT_SOURCES += $(WCHAR_H)
+BUILT_SOURCES += wchar.h
 
 # We need the following in order to create <wchar.h> when the system
 # version does not work standalone.
-wchar.h: wchar.in.h
-        rm -f $@-t $@
+wchar.h: wchar.in.h $(CXXDEFS_H) $(ARG_NONNULL_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
@@ -1316,9 +1768,11 @@ wchar.h: wchar.in.h
               -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
               -e 's|@''REPLACE_WCSNRTOMBS''@|$(REPLACE_WCSNRTOMBS)|g' \
               -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
-              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_ARG_NONNULL/r $(ARG_NONNULL_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
             < $(srcdir)/wchar.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
 
@@ -1337,22 +1791,25 @@ EXTRA_libgnu_a_SOURCES += wcrtomb.c
 
 ## begin gnulib module wctype
 
-BUILT_SOURCES += $(WCTYPE_H)
+BUILT_SOURCES += wctype.h
 
 # We need the following in order to create <wctype.h> when the system
 # doesn't have one that works with the given compiler.
-wctype.h: wctype.in.h
-        rm -f $@-t $@
+wctype.h: wctype.in.h $(CXXDEFS_H) $(WARN_ON_USE_H)
+        $(AM_V_GEN)rm -f $@-t $@ && \
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
               -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
               -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+              -e 's/@''HAVE_ISWBLANK''@/$(HAVE_ISWBLANK)/g' \
               -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
               -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
               -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
+              -e '/definitions of _GL_FUNCDECL_RPL/r $(CXXDEFS_H)' \
+              -e '/definition of _GL_WARN_ON_USE/r $(WARN_ON_USE_H)' \
               < $(srcdir)/wctype.in.h; \
-        } > $@-t
+        } > $@-t && \
         mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t