Sync to latest Gnulib

git-svn-id: https://nagiosplug.svn.sourceforge.net/svnroot/nagiosplug/nagiosplug/trunk@1925 f882894a-f735-0410-b71e-b25c423dba1c

1 files changed, 428 insertions, 88 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 67c9872..92c675e 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -9,7 +9,7 @@
 # the same distribution terms as the rest of that program.
 #
 # Generated by gnulib-tool.
-# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=. --no-libtool --macro-prefix=gl dirname fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex vasprintf vsnprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --doc-base=doc --aux-dir=build-aux --no-libtool --macro-prefix=gl dirname fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex vasprintf vsnprintf
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
@@ -34,6 +34,15 @@ libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgnu_a_SOURCES =
 
+## begin gnulib module absolute-header
+
+# Use this preprocessor expression to decide whether #include_next works.
+# Do not rely on a 'configure'-time test for this, since the expression
+# might appear in an installed header, which is used by some other compiler.
+HAVE_INCLUDE_NEXT = (__GNUC__ || 60000000 <= __DECC_VER)
+
+## end   gnulib module absolute-header
+
 ## begin gnulib module alloca
 
 
@@ -51,14 +60,14 @@ 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_.h
+alloca.h: alloca.in.h
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          cat $(srcdir)/alloca_.h; \
+          cat $(srcdir)/alloca.in.h; \
         } > $@-t
         mv -f $@-t $@
 MOSTLYCLEANFILES += alloca.h alloca.h-t
 
-EXTRA_DIST += alloca_.h
+EXTRA_DIST += alloca.in.h
 
 ## end   gnulib module alloca-opt
 
@@ -69,7 +78,7 @@ 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:
-        test -d arpa || mkdir arpa
+        @MKDIR_P@ arpa
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           echo '#include <sys/socket.h>'; \
@@ -98,6 +107,62 @@ EXTRA_libgnu_a_SOURCES += cloexec.c
 
 ## end   gnulib module cloexec
 
+## begin gnulib module configmake
+
+# Retrieve values of the variables through 'configure' followed by
+# 'make', not directly through 'configure', so that a user who
+# sets some of these variables consistently on the 'make' command
+# line gets correct results.
+#
+# One advantage of this approach, compared to the classical
+# approach of adding -DLIBDIR=\"$(libdir)\" etc. to AM_CPPFLAGS,
+# is that it protects against the use of undefined variables.
+# If, say, $(libdir) is not set in the Makefile, LIBDIR is not
+# defined by this module, and code using LIBDIR gives a
+# compilation error.
+#
+# Another advantage is that 'make' output is shorter.
+#
+# Listed in the same order as the GNU makefile conventions.
+# The Automake-defined pkg* macros are appended, in the order
+# listed in the Automake 1.10a+ documentation.
+configmake.h: Makefile
+        rm -f $@-t $@
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
+          echo '#define PREFIX "$(prefix)"'; \
+          echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
+          echo '#define BINDIR "$(bindir)"'; \
+          echo '#define SBINDIR "$(sbindir)"'; \
+          echo '#define LIBEXECDIR "$(libexecdir)"'; \
+          echo '#define DATAROOTDIR "$(datarootdir)"'; \
+          echo '#define DATADIR "$(datadir)"'; \
+          echo '#define SYSCONFDIR "$(sysconfdir)"'; \
+          echo '#define SHAREDSTATEDIR "$(sharedstatedir)"'; \
+          echo '#define LOCALSTATEDIR "$(localstatedir)"'; \
+          echo '#define INCLUDEDIR "$(includedir)"'; \
+          echo '#define OLDINCLUDEDIR "$(oldincludedir)"'; \
+          echo '#define DOCDIR "$(docdir)"'; \
+          echo '#define INFODIR "$(infodir)"'; \
+          echo '#define HTMLDIR "$(htmldir)"'; \
+          echo '#define DVIDIR "$(dvidir)"'; \
+          echo '#define PDFDIR "$(pdfdir)"'; \
+          echo '#define PSDIR "$(psdir)"'; \
+          echo '#define LIBDIR "$(libdir)"'; \
+          echo '#define LISPDIR "$(lispdir)"'; \
+          echo '#define LOCALEDIR "$(localedir)"'; \
+          echo '#define MANDIR "$(mandir)"'; \
+          echo '#define MANEXT "$(manext)"'; \
+          echo '#define PKGDATADIR "$(pkgdatadir)"'; \
+          echo '#define PKGINCLUDEDIR "$(pkgincludedir)"'; \
+          echo '#define PKGLIBDIR "$(pkglibdir)"'; \
+          echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
+        } | sed '/""/d' > $@-t
+        mv $@-t $@
+BUILT_SOURCES += configmake.h
+CLEANFILES += configmake.h configmake.h-t
+
+## end   gnulib module configmake
+
 ## begin gnulib module dirname
 
 
@@ -116,12 +181,6 @@ EXTRA_libgnu_a_SOURCES += error.c
 
 ## end   gnulib module error
 
-## begin gnulib module exit
-
-libgnu_a_SOURCES += exit.h
-
-## end   gnulib module exit
-
 ## begin gnulib module exitfail
 
 
@@ -140,6 +199,26 @@ EXTRA_libgnu_a_SOURCES += creat-safer.c open-safer.c
 
 ## end   gnulib module fcntl-safer
 
+## begin gnulib module float
+
+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 $@
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_FLOAT_H''@|$(NEXT_FLOAT_H)|g' \
+              < $(srcdir)/float.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += float.h float.h-t
+
+EXTRA_DIST += float.in.h
+
+## end   gnulib module float
+
 ## begin gnulib module fsusage
 
 
@@ -194,14 +273,14 @@ 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_.h
+getopt.h: getopt.in.h
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          cat $(srcdir)/getopt_.h; \
+          cat $(srcdir)/getopt.in.h; \
         } > $@-t
         mv -f $@-t $@
 MOSTLYCLEANFILES += getopt.h getopt.h-t
 
-EXTRA_DIST += getopt.c getopt1.c getopt_.h getopt_int.h
+EXTRA_DIST += getopt.c getopt.in.h getopt1.c getopt_int.h
 
 EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 
@@ -219,6 +298,8 @@ EXTRA_libgnu_a_SOURCES += getopt.c getopt1.c
 # "gettextize --intl".
 AM_CPPFLAGS += -I$(top_builddir)/intl
 
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
 ## end   gnulib module gettext
 
 ## begin gnulib module gettext-h
@@ -227,6 +308,13 @@ libgnu_a_SOURCES += gettext.h
 
 ## end   gnulib module gettext-h
 
+## begin gnulib module havelib
+
+
+EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
+
+## end   gnulib module havelib
+
 ## begin gnulib module inet_ntop
 
 
@@ -243,44 +331,89 @@ EXTRA_DIST += intprops.h
 
 ## end   gnulib module intprops
 
-## begin gnulib module malloc
-
-
-EXTRA_DIST += malloc.c
-
-EXTRA_libgnu_a_SOURCES += malloc.c
-
-## end   gnulib module malloc
-
-## begin gnulib module mbchar
+## begin gnulib module link-warning
+
+LINK_WARNING_H=$(top_srcdir)/build-aux/link-warning.h
+
+EXTRA_DIST += $(top_srcdir)/build-aux/link-warning.h
+
+## end   gnulib module link-warning
+
+## begin gnulib module localcharset
+
+libgnu_a_SOURCES += localcharset.h localcharset.c
+
+# We need the following in order to install a simple file in $(libdir)
+# which is shared with other installed packages. We use a list of referencing
+# packages so that "make uninstall" will remove the file if and only if it
+# is not used by another installed package.
+# On systems with glibc-2.1 or newer, the file is redundant, therefore we
+# avoid installing it.
+
+all-local: charset.alias ref-add.sed ref-del.sed
+
+charset_alias = $(DESTDIR)$(libdir)/charset.alias
+charset_tmp = $(DESTDIR)$(libdir)/charset.tmp
+install-exec-local: all-local
+        test $(GLIBC21) != no || $(mkinstalldirs) $(DESTDIR)$(libdir)
+        if test -f $(charset_alias); then \
+          sed -f ref-add.sed $(charset_alias) > $(charset_tmp) ; \
+          $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+          rm -f $(charset_tmp) ; \
+        else \
+          if test $(GLIBC21) = no; then \
+            sed -f ref-add.sed charset.alias > $(charset_tmp) ; \
+            $(INSTALL_DATA) $(charset_tmp) $(charset_alias) ; \
+            rm -f $(charset_tmp) ; \
+          fi ; \
+        fi
+
+uninstall-local: all-local
+        if test -f $(charset_alias); then \
+          sed -f ref-del.sed $(charset_alias) > $(charset_tmp); \
+          if grep '^# Packages using this file: $$' $(charset_tmp) \
+              > /dev/null; then \
+            rm -f $(charset_alias); \
+          else \
+            $(INSTALL_DATA) $(charset_tmp) $(charset_alias); \
+          fi; \
+          rm -f $(charset_tmp); \
+        fi
 
+charset.alias: config.charset
+        rm -f t-$@ $@
+        $(SHELL) $(srcdir)/config.charset '$(host)' > t-$@
+        mv t-$@ $@
 
-EXTRA_DIST += mbchar.c mbchar.h
+SUFFIXES += .sed .sin
+.sin.sed:
+        rm -f t-$@ $@
+        sed -e '/^#/d' -e 's/@''PACKAGE''@/$(PACKAGE)/g' $< > t-$@
+        mv t-$@ $@
 
-EXTRA_libgnu_a_SOURCES += mbchar.c
+CLEANFILES += charset.alias ref-add.sed ref-del.sed
 
-## end   gnulib module mbchar
+EXTRA_DIST += config.charset ref-add.sin ref-del.sin
 
-## begin gnulib module mbuiter
+## end   gnulib module localcharset
 
-libgnu_a_SOURCES += mbuiter.h
+## begin gnulib module malloc
 
-## end   gnulib module mbuiter
 
-## begin gnulib module memchr
+EXTRA_DIST += malloc.c
 
+EXTRA_libgnu_a_SOURCES += malloc.c
 
-EXTRA_DIST += memchr.c
+## end   gnulib module malloc
 
-EXTRA_libgnu_a_SOURCES += memchr.c
+## begin gnulib module malloc-posix
 
-## end   gnulib module memchr
 
-## begin gnulib module minmax
+EXTRA_DIST += malloc.c
 
-libgnu_a_SOURCES += minmax.h
+EXTRA_libgnu_a_SOURCES += malloc.c
 
-## end   gnulib module minmax
+## end   gnulib module malloc-posix
 
 ## begin gnulib module mountlist
 
@@ -297,16 +430,21 @@ 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:
-        test -d netinet || mkdir netinet
+netinet/in.h: netinet_in.in.h
+        @MKDIR_P@ netinet
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          echo '#include <sys/socket.h>'; \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/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
         mv $@-t $@
 MOSTLYCLEANFILES += netinet/in.h netinet/in.h-t
 MOSTLYCLEANDIRS += netinet
 
+EXTRA_DIST += netinet_in.in.h
+
 ## end   gnulib module netinet_in
 
 ## begin gnulib module regex
@@ -345,7 +483,7 @@ libgnu_a_SOURCES += size_max.h
 ## begin gnulib module snprintf
 
 
-EXTRA_DIST += snprintf.c snprintf.h
+EXTRA_DIST += snprintf.c
 
 EXTRA_libgnu_a_SOURCES += snprintf.c
 
@@ -357,15 +495,15 @@ 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_.h
+stdbool.h: stdbool.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool_.h; \
+          sed -e 's/@''HAVE__BOOL''@/$(HAVE__BOOL)/g' < $(srcdir)/stdbool.in.h; \
         } > $@-t
         mv $@-t $@
 MOSTLYCLEANFILES += stdbool.h stdbool.h-t
 
-EXTRA_DIST += stdbool_.h
+EXTRA_DIST += stdbool.in.h
 
 ## end   gnulib module stdbool
 
@@ -375,11 +513,12 @@ 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_.h
+stdint.h: stdint.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's/@''HAVE_STDINT_H''@/$(HAVE_STDINT_H)/g' \
-              -e 's|@''ABSOLUTE_STDINT_H''@|$(ABSOLUTE_STDINT_H)|g' \
+              -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_STDINT_H''@|$(NEXT_STDINT_H)|g' \
               -e 's/@''HAVE_SYS_TYPES_H''@/$(HAVE_SYS_TYPES_H)/g' \
               -e 's/@''HAVE_INTTYPES_H''@/$(HAVE_INTTYPES_H)/g' \
               -e 's/@''HAVE_SYS_INTTYPES_H''@/$(HAVE_SYS_INTTYPES_H)/g' \
@@ -399,37 +538,210 @@ stdint.h: stdint_.h
               -e 's/@''BITSIZEOF_WINT_T''@/$(BITSIZEOF_WINT_T)/g' \
               -e 's/@''HAVE_SIGNED_WINT_T''@/$(HAVE_SIGNED_WINT_T)/g' \
               -e 's/@''WINT_T_SUFFIX''@/$(WINT_T_SUFFIX)/g' \
-              < $(srcdir)/stdint_.h; \
+              < $(srcdir)/stdint.in.h; \
         } > $@-t
         mv $@-t $@
 MOSTLYCLEANFILES += stdint.h stdint.h-t
 
-EXTRA_DIST += stdint_.h
+EXTRA_DIST += stdint.in.h
 
 ## end   gnulib module stdint
 
-## begin gnulib module strcase
+## begin gnulib module stdio
+
+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 $@
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_STDIO_H''@|$(NEXT_STDIO_H)|g' \
+              -e 's|@''GNULIB_FPRINTF_POSIX''@|$(GNULIB_FPRINTF_POSIX)|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_POSIX''@|$(GNULIB_VFPRINTF_POSIX)|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_VASPRINTF''@|$(GNULIB_VASPRINTF)|g' \
+              -e 's|@''GNULIB_FOPEN''@|$(GNULIB_FOPEN)|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_GETDELIM''@|$(GNULIB_GETDELIM)|g' \
+              -e 's|@''GNULIB_GETLINE''@|$(GNULIB_GETLINE)|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|@''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_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
+              -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
+              -e 's|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|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_FTELL''@|$(REPLACE_FTELL)|g' \
+              -e 's|@''REPLACE_FFLUSH''@|$(REPLACE_FFLUSH)|g' \
+              -e 's|@''HAVE_DECL_GETDELIM''@|$(HAVE_DECL_GETDELIM)|g' \
+              -e 's|@''HAVE_DECL_GETLINE''@|$(HAVE_DECL_GETLINE)|g' \
+              -e 's|@''REPLACE_GETLINE''@|$(REPLACE_GETLINE)|g' \
+              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              < $(srcdir)/stdio.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += stdio.h stdio.h-t
+
+EXTRA_DIST += stdio.in.h
+
+## end   gnulib module stdio
 
+## begin gnulib module stdlib
 
-EXTRA_DIST += strcase.h strcasecmp.c strncasecmp.c
+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 $@
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_STDLIB_H''@|$(NEXT_STDLIB_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_GETSUBOPT''@|$(GNULIB_GETSUBOPT)|g' \
+              -e 's|@''GNULIB_MKDTEMP''@|$(GNULIB_MKDTEMP)|g' \
+              -e 's|@''GNULIB_MKSTEMP''@|$(GNULIB_MKSTEMP)|g' \
+              -e 's|@''GNULIB_PUTENV''@|$(GNULIB_PUTENV)|g' \
+              -e 's|@''GNULIB_SETENV''@|$(GNULIB_SETENV)|g' \
+              -e 's|@''GNULIB_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
+              -e 's|@''HAVE_CALLOC_POSIX''@|$(HAVE_CALLOC_POSIX)|g' \
+              -e 's|@''HAVE_GETSUBOPT''@|$(HAVE_GETSUBOPT)|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_SETENV''@|$(HAVE_SETENV)|g' \
+              -e 's|@''HAVE_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+              -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+              -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|g' \
+              -e 's|@''VOID_UNSETENV''@|$(VOID_UNSETENV)|g' \
+              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              < $(srcdir)/stdlib.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t
 
-EXTRA_libgnu_a_SOURCES += strcasecmp.c strncasecmp.c
+EXTRA_DIST += stdlib.in.h
 
-## end   gnulib module strcase
+## end   gnulib module stdlib
 
 ## begin gnulib module strdup
 
 
-EXTRA_DIST += strdup.c strdup.h
+EXTRA_DIST += strdup.c
 
 EXTRA_libgnu_a_SOURCES += strdup.c
 
 ## end   gnulib module strdup
 
+## begin gnulib module strerror
+
+
+EXTRA_DIST += strerror.c
+
+EXTRA_libgnu_a_SOURCES += strerror.c
+
+## end   gnulib module strerror
+
+## begin gnulib module string
+
+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 $@
+        { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
+              -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
+              -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
+              -e 's|@''GNULIB_MBSCHR''@|$(GNULIB_MBSCHR)|g' \
+              -e 's|@''GNULIB_MBSRCHR''@|$(GNULIB_MBSRCHR)|g' \
+              -e 's|@''GNULIB_MBSSTR''@|$(GNULIB_MBSSTR)|g' \
+              -e 's|@''GNULIB_MBSCASECMP''@|$(GNULIB_MBSCASECMP)|g' \
+              -e 's|@''GNULIB_MBSNCASECMP''@|$(GNULIB_MBSNCASECMP)|g' \
+              -e 's|@''GNULIB_MBSPCASECMP''@|$(GNULIB_MBSPCASECMP)|g' \
+              -e 's|@''GNULIB_MBSCASESTR''@|$(GNULIB_MBSCASESTR)|g' \
+              -e 's|@''GNULIB_MBSCSPN''@|$(GNULIB_MBSCSPN)|g' \
+              -e 's|@''GNULIB_MBSPBRK''@|$(GNULIB_MBSPBRK)|g' \
+              -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_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
+              -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
+              -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+              -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
+              -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
+              -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
+              -e 's|@''GNULIB_STRDUP''@|$(GNULIB_STRDUP)|g' \
+              -e 's|@''GNULIB_STRNDUP''@|$(GNULIB_STRNDUP)|g' \
+              -e 's|@''GNULIB_STRNLEN''@|$(GNULIB_STRNLEN)|g' \
+              -e 's|@''GNULIB_STRPBRK''@|$(GNULIB_STRPBRK)|g' \
+              -e 's|@''GNULIB_STRSEP''@|$(GNULIB_STRSEP)|g' \
+              -e 's|@''GNULIB_STRSTR''@|$(GNULIB_STRSTR)|g' \
+              -e 's|@''GNULIB_STRCASESTR''@|$(GNULIB_STRCASESTR)|g' \
+              -e 's|@''GNULIB_STRTOK_R''@|$(GNULIB_STRTOK_R)|g' \
+              -e 's|@''GNULIB_STRERROR''@|$(GNULIB_STRERROR)|g' \
+              -e 's|@''GNULIB_STRSIGNAL''@|$(GNULIB_STRSIGNAL)|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' \
+              -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
+              -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|@''REPLACE_MEMMEM''@|$(REPLACE_MEMMEM)|g' \
+              -e 's|@''REPLACE_STRCASESTR''@|$(REPLACE_STRCASESTR)|g' \
+              -e 's|@''REPLACE_STRSTR''@|$(REPLACE_STRSTR)|g' \
+              -e 's|@''REPLACE_STRERROR''@|$(REPLACE_STRERROR)|g' \
+              -e 's|@''REPLACE_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
+              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+              < $(srcdir)/string.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += string.h string.h-t
+
+EXTRA_DIST += string.in.h
+
+## end   gnulib module string
+
 ## begin gnulib module strndup
 
 
-EXTRA_DIST += strndup.c strndup.h
+EXTRA_DIST += strndup.c
 
 EXTRA_libgnu_a_SOURCES += strndup.c
 
@@ -438,53 +750,79 @@ EXTRA_libgnu_a_SOURCES += strndup.c
 ## begin gnulib module strnlen
 
 
-EXTRA_DIST += strnlen.c strnlen.h
+EXTRA_DIST += strnlen.c
 
 EXTRA_libgnu_a_SOURCES += strnlen.c
 
 ## end   gnulib module strnlen
 
-## begin gnulib module strnlen1
-
-libgnu_a_SOURCES += strnlen1.h strnlen1.c
-
-## end   gnulib module strnlen1
-
 ## begin gnulib module sys_socket
 
 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: socket_.h
+sys/socket.h: sys_socket.in.h
         @MKDIR_P@ sys
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          cat $(srcdir)/socket_.h; \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_SYS_SOCKET_H''@|$(NEXT_SYS_SOCKET_H)|g' \
+              -e 's|@''HAVE_SYS_SOCKET_H''@|$(HAVE_SYS_SOCKET_H)|g' \
+              -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
+              -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+              < $(srcdir)/sys_socket.in.h; \
         } > $@-t
         mv -f $@-t $@
 MOSTLYCLEANFILES += sys/socket.h sys/socket.h-t
 MOSTLYCLEANDIRS += sys
 
-EXTRA_DIST += socket_.h
+EXTRA_DIST += sys_socket.in.h
 
 ## end   gnulib module sys_socket
 
 ## begin gnulib module unistd
 
-BUILT_SOURCES += $(UNISTD_H)
+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_.h
+unistd.h: unistd.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's|@''ABSOLUTE_UNISTD_H''@|$(ABSOLUTE_UNISTD_H)|g' \
-              < $(srcdir)/unistd_.h; \
+          sed -e 's|@''HAVE_UNISTD_H''@|$(HAVE_UNISTD_H)|g' \
+              -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
+              -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+              -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+              -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|g' \
+              -e 's|@''GNULIB_FTRUNCATE''@|$(GNULIB_FTRUNCATE)|g' \
+              -e 's|@''GNULIB_GETCWD''@|$(GNULIB_GETCWD)|g' \
+              -e 's|@''GNULIB_GETLOGIN_R''@|$(GNULIB_GETLOGIN_R)|g' \
+              -e 's|@''GNULIB_GETPAGESIZE''@|$(GNULIB_GETPAGESIZE)|g' \
+              -e 's|@''GNULIB_LCHOWN''@|$(GNULIB_LCHOWN)|g' \
+              -e 's|@''GNULIB_LSEEK''@|$(GNULIB_LSEEK)|g' \
+              -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
+              -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+              -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+              -e 's|@''HAVE_FTRUNCATE''@|$(HAVE_FTRUNCATE)|g' \
+              -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+              -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
+              -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+              -e 's|@''HAVE_DECL_GETLOGIN_R''@|$(HAVE_DECL_GETLOGIN_R)|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_FCHDIR''@|$(REPLACE_FCHDIR)|g' \
+              -e 's|@''REPLACE_GETCWD''@|$(REPLACE_GETCWD)|g' \
+              -e 's|@''REPLACE_GETPAGESIZE''@|$(REPLACE_GETPAGESIZE)|g' \
+              -e 's|@''REPLACE_LCHOWN''@|$(REPLACE_LCHOWN)|g' \
+              -e 's|@''REPLACE_LSEEK''@|$(REPLACE_LSEEK)|g' \
+              < $(srcdir)/unistd.in.h; \
         } > $@-t
         mv $@-t $@
 MOSTLYCLEANFILES += unistd.h unistd.h-t
 
-EXTRA_DIST += unistd_.h
+EXTRA_DIST += unistd.in.h
 
 ## end   gnulib module unistd
 
@@ -500,7 +838,7 @@ EXTRA_libgnu_a_SOURCES += dup-safer.c fd-safer.c pipe-safer.c
 ## begin gnulib module vasnprintf
 
 
-EXTRA_DIST += asnprintf.c printf-args.c printf-args.h printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h
+EXTRA_DIST += asnprintf.c float+.h printf-args.c printf-args.h printf-parse.c printf-parse.h vasnprintf.c vasnprintf.h
 
 EXTRA_libgnu_a_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
 
@@ -509,7 +847,7 @@ EXTRA_libgnu_a_SOURCES += asnprintf.c printf-args.c printf-parse.c vasnprintf.c
 ## begin gnulib module vasprintf
 
 
-EXTRA_DIST += asprintf.c vasprintf.c vasprintf.h
+EXTRA_DIST += asprintf.c vasprintf.c
 
 EXTRA_libgnu_a_SOURCES += asprintf.c vasprintf.c
 
@@ -518,7 +856,7 @@ EXTRA_libgnu_a_SOURCES += asprintf.c vasprintf.c
 ## begin gnulib module vsnprintf
 
 
-EXTRA_DIST += vsnprintf.c vsnprintf.h
+EXTRA_DIST += vsnprintf.c
 
 EXTRA_libgnu_a_SOURCES += vsnprintf.c
 
@@ -530,16 +868,22 @@ 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_.h
+wchar.h: wchar.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's|@''ABSOLUTE_WCHAR_H''@|$(ABSOLUTE_WCHAR_H)|g' \
-            < $(srcdir)/wchar_.h; \
+          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
+              -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+              -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+              -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+              -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
+              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+            < $(srcdir)/wchar.in.h; \
         } > $@-t
         mv $@-t $@
 MOSTLYCLEANFILES += wchar.h wchar.h-t
 
-EXTRA_DIST += wchar_.h
+EXTRA_DIST += wchar.in.h
 
 ## end   gnulib module wchar
 
@@ -549,28 +893,23 @@ 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_.h
+wctype.h: wctype.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           sed -e 's/@''HAVE_WCTYPE_H''@/$(HAVE_WCTYPE_H)/g' \
-              -e 's|@''ABSOLUTE_WCTYPE_H''@|$(ABSOLUTE_WCTYPE_H)|g' \
-              -e 's/@''HAVE_WCTYPE_CTMP_BUG''@/$(HAVE_WCTYPE_CTMP_BUG)/g' \
+              -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''NEXT_WCTYPE_H''@|$(NEXT_WCTYPE_H)|g' \
+              -e 's/@''HAVE_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
               -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
-              < $(srcdir)/wctype_.h; \
+              < $(srcdir)/wctype.in.h; \
         } > $@-t
         mv $@-t $@
 MOSTLYCLEANFILES += wctype.h wctype.h-t
 
-EXTRA_DIST += wctype_.h
+EXTRA_DIST += wctype.in.h
 
 ## end   gnulib module wctype
 
-## begin gnulib module wcwidth
-
-libgnu_a_SOURCES += wcwidth.h
-
-## end   gnulib module wcwidth
-
 ## begin gnulib module xalloc
 
 
@@ -604,4 +943,5 @@ mostlyclean-local: mostlyclean-generic
           if test -n "$$dir" && test -d $$dir; then \
             echo "rmdir $$dir"; rmdir $$dir; \
           fi; \
-        done
+        done; \
+        :