Sync with gnulib

1 files changed, 310 insertions, 33 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 1eefee9d..1a407c58 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) 2004-2007 Free Software Foundation, Inc.
+# Copyright (C) 2002-2009 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
@@ -9,10 +9,11 @@
 # 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=build-aux --no-libtool --macro-prefix=gl base64 dirname floorf 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 --tests-base=tests --aux-dir=build-aux --no-libtool --macro-prefix=gl base64 dirname floorf fsusage getaddrinfo gethostname getloadavg getopt gettext mountlist regex vasprintf vsnprintf
 
 AUTOMAKE_OPTIONS = 1.5 gnits
 
+SUBDIRS =
 noinst_HEADERS =
 noinst_LIBRARIES =
 noinst_LTLIBRARIES =
@@ -24,6 +25,7 @@ MOSTLYCLEANDIRS =
 CLEANFILES =
 DISTCLEANFILES =
 MAINTAINERCLEANFILES =
+EXTRA_DIST += m4/gnulib-cache.m4
 
 AM_CPPFLAGS =
 
@@ -34,15 +36,6 @@ 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
 
 
@@ -81,12 +74,23 @@ arpa/inet.h:
         @MKDIR_P@ arpa
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          echo '#include <sys/socket.h>'; \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
+              -e 's|@''NEXT_ARPA_INET_H''@|$(NEXT_ARPA_INET_H)|g' \
+              -e 's|@''HAVE_ARPA_INET_H''@|$(HAVE_ARPA_INET_H)|g' \
+              -e 's|@''GNULIB_INET_NTOP''@|$(GNULIB_INET_NTOP)|g' \
+              -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)' \
+              < $(srcdir)/arpa_inet.in.h; \
         } > $@-t
         mv $@-t $@
 MOSTLYCLEANFILES += arpa/inet.h arpa/inet.h-t
 MOSTLYCLEANDIRS += arpa
 
+EXTRA_DIST += arpa_inet.in.h
+
 ## end   gnulib module arpa_inet
 
 ## begin gnulib module base64
@@ -95,6 +99,15 @@ libgnu_a_SOURCES += base64.h base64.c
 
 ## end   gnulib module base64
 
+## begin gnulib module btowc
+
+
+EXTRA_DIST += btowc.c
+
+EXTRA_libgnu_a_SOURCES += btowc.c
+
+## end   gnulib module btowc
+
 ## begin gnulib module c-strtod
 
 
@@ -178,6 +191,33 @@ EXTRA_libgnu_a_SOURCES += basename.c dirname.c stripslash.c
 
 ## end   gnulib module dirname
 
+## begin gnulib module errno
+
+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 $@
+        { 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_ERRNO_H''@|$(NEXT_ERRNO_H)|g' \
+              -e 's|@''EMULTIHOP_HIDDEN''@|$(EMULTIHOP_HIDDEN)|g' \
+              -e 's|@''EMULTIHOP_VALUE''@|$(EMULTIHOP_VALUE)|g' \
+              -e 's|@''ENOLINK_HIDDEN''@|$(ENOLINK_HIDDEN)|g' \
+              -e 's|@''ENOLINK_VALUE''@|$(ENOLINK_VALUE)|g' \
+              -e 's|@''EOVERFLOW_HIDDEN''@|$(EOVERFLOW_HIDDEN)|g' \
+              -e 's|@''EOVERFLOW_VALUE''@|$(EOVERFLOW_VALUE)|g' \
+              < $(srcdir)/errno.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += errno.h errno.h-t
+
+EXTRA_DIST += errno.in.h
+
+## end   gnulib module errno
+
 ## begin gnulib module error
 
 
@@ -196,6 +236,29 @@ EXTRA_libgnu_a_SOURCES += exitfail.c
 
 ## end   gnulib module exitfail
 
+## begin gnulib module fcntl
+
+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 $@
+        { 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_OPEN''@|$(GNULIB_OPEN)|g' \
+              -e 's|@''REPLACE_OPEN''@|$(REPLACE_OPEN)|g' \
+              < $(srcdir)/fcntl.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += fcntl.h fcntl.h-t
+
+EXTRA_DIST += fcntl.in.h
+
+## end   gnulib module fcntl
+
 ## begin gnulib module fcntl-safer
 
 
@@ -214,7 +277,8 @@ BUILT_SOURCES += $(FLOAT_H)
 float.h: float.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          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
@@ -258,7 +322,7 @@ libgnu_a_SOURCES += full-write.h full-write.c
 ## begin gnulib module getaddrinfo
 
 
-EXTRA_DIST += gai_strerror.c getaddrinfo.c getaddrinfo.h
+EXTRA_DIST += gai_strerror.c getaddrinfo.c
 
 EXTRA_libgnu_a_SOURCES += gai_strerror.c getaddrinfo.c
 
@@ -333,7 +397,7 @@ EXTRA_DIST += $(top_srcdir)/build-aux/config.rpath
 ## begin gnulib module inet_ntop
 
 
-EXTRA_DIST += inet_ntop.c inet_ntop.h
+EXTRA_DIST += inet_ntop.c
 
 EXTRA_libgnu_a_SOURCES += inet_ntop.c
 
@@ -439,7 +503,8 @@ BUILT_SOURCES += math.h
 math.h: math.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          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|@''GNULIB_CEILF''@|$(GNULIB_CEILF)|g' \
               -e 's|@''GNULIB_CEILL''@|$(GNULIB_CEILL)|g' \
@@ -448,6 +513,11 @@ math.h: math.in.h
               -e 's|@''GNULIB_FREXP''@|$(GNULIB_FREXP)|g' \
               -e 's|@''GNULIB_FREXPL''@|$(GNULIB_FREXPL)|g' \
               -e 's|@''GNULIB_ISFINITE''@|$(GNULIB_ISFINITE)|g' \
+              -e 's|@''GNULIB_ISINF''@|$(GNULIB_ISINF)|g' \
+              -e 's|@''GNULIB_ISNAN''@|$(GNULIB_ISNAN)|g' \
+              -e 's|@''GNULIB_ISNANF''@|$(GNULIB_ISNANF)|g' \
+              -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_ROUND''@|$(GNULIB_ROUND)|g' \
@@ -457,6 +527,9 @@ math.h: math.in.h
               -e 's|@''GNULIB_TRUNC''@|$(GNULIB_TRUNC)|g' \
               -e 's|@''GNULIB_TRUNCF''@|$(GNULIB_TRUNCF)|g' \
               -e 's|@''GNULIB_TRUNCL''@|$(GNULIB_TRUNCL)|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_DECL_ACOSL''@|$(HAVE_DECL_ACOSL)|g' \
               -e 's|@''HAVE_DECL_ASINL''@|$(HAVE_DECL_ASINL)|g' \
               -e 's|@''HAVE_DECL_ATANL''@|$(HAVE_DECL_ATANL)|g' \
@@ -470,20 +543,24 @@ math.h: math.in.h
               -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' \
               -e 's|@''REPLACE_FLOORL''@|$(REPLACE_FLOORL)|g' \
               -e 's|@''REPLACE_FREXP''@|$(REPLACE_FREXP)|g' \
               -e 's|@''REPLACE_FREXPL''@|$(REPLACE_FREXPL)|g' \
+              -e 's|@''REPLACE_HUGE_VAL''@|$(REPLACE_HUGE_VAL)|g' \
               -e 's|@''REPLACE_ISFINITE''@|$(REPLACE_ISFINITE)|g' \
+              -e 's|@''REPLACE_ISINF''@|$(REPLACE_ISINF)|g' \
+              -e 's|@''REPLACE_ISNAN''@|$(REPLACE_ISNAN)|g' \
               -e 's|@''REPLACE_LDEXPL''@|$(REPLACE_LDEXPL)|g' \
+              -e 's|@''REPLACE_NAN''@|$(REPLACE_NAN)|g' \
               -e 's|@''REPLACE_ROUND''@|$(REPLACE_ROUND)|g' \
               -e 's|@''REPLACE_ROUNDF''@|$(REPLACE_ROUNDF)|g' \
               -e 's|@''REPLACE_ROUNDL''@|$(REPLACE_ROUNDL)|g' \
               -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)' \
               < $(srcdir)/math.in.h; \
         } > $@-t
@@ -494,6 +571,24 @@ EXTRA_DIST += math.in.h
 
 ## end   gnulib module math
 
+## begin gnulib module mbrtowc
+
+
+EXTRA_DIST += mbrtowc.c
+
+EXTRA_libgnu_a_SOURCES += mbrtowc.c
+
+## end   gnulib module mbrtowc
+
+## begin gnulib module mbsinit
+
+
+EXTRA_DIST += mbsinit.c
+
+EXTRA_libgnu_a_SOURCES += mbsinit.c
+
+## end   gnulib module mbsinit
+
 ## begin gnulib module mountlist
 
 
@@ -503,6 +598,34 @@ EXTRA_libgnu_a_SOURCES += mountlist.c
 
 ## end   gnulib module mountlist
 
+## begin gnulib module netdb
+
+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 $@
+        { 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_NETDB_H''@|$(NEXT_NETDB_H)|g' \
+              -e 's|@''HAVE_NETDB_H''@|$(HAVE_NETDB_H)|g' \
+              -e 's|@''GNULIB_GETADDRINFO''@|$(GNULIB_GETADDRINFO)|g' \
+              -e 's|@''HAVE_STRUCT_ADDRINFO''@|$(HAVE_STRUCT_ADDRINFO)|g' \
+              -e 's|@''HAVE_DECL_FREEADDRINFO''@|$(HAVE_DECL_FREEADDRINFO)|g' \
+              -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' \
+              < $(srcdir)/netdb.in.h; \
+        } > $@-t
+        mv $@-t $@
+MOSTLYCLEANFILES += netdb.h netdb.h-t
+
+EXTRA_DIST += netdb.in.h
+
+## end   gnulib module netdb
+
 ## begin gnulib module netinet_in
 
 BUILT_SOURCES += $(NETINET_IN_H)
@@ -513,7 +636,8 @@ netinet/in.h: netinet_in.in.h
         @MKDIR_P@ netinet
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          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; \
@@ -526,6 +650,15 @@ EXTRA_DIST += netinet_in.in.h
 
 ## end   gnulib module netinet_in
 
+## begin gnulib module open
+
+
+EXTRA_DIST += open.c
+
+EXTRA_libgnu_a_SOURCES += open.c
+
+## end   gnulib module open
+
 ## begin gnulib module regex
 
 
@@ -596,7 +729,8 @@ 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/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|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' \
@@ -604,6 +738,7 @@ stdint.h: stdint.in.h
               -e 's/@''HAVE_SYS_BITYPES_H''@/$(HAVE_SYS_BITYPES_H)/g' \
               -e 's/@''HAVE_LONG_LONG_INT''@/$(HAVE_LONG_LONG_INT)/g' \
               -e 's/@''HAVE_UNSIGNED_LONG_LONG_INT''@/$(HAVE_UNSIGNED_LONG_LONG_INT)/g' \
+              -e 's/@''APPLE_UNIVERSAL_BUILD''@/$(APPLE_UNIVERSAL_BUILD)/g' \
               -e 's/@''BITSIZEOF_PTRDIFF_T''@/$(BITSIZEOF_PTRDIFF_T)/g' \
               -e 's/@''PTRDIFF_T_SUFFIX''@/$(PTRDIFF_T_SUFFIX)/g' \
               -e 's/@''BITSIZEOF_SIG_ATOMIC_T''@/$(BITSIZEOF_SIG_ATOMIC_T)/g' \
@@ -635,17 +770,24 @@ BUILT_SOURCES += stdio.h
 stdio.h: stdio.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          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_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_FOPEN''@|$(GNULIB_FOPEN)|g' \
               -e 's|@''GNULIB_FREOPEN''@|$(GNULIB_FREOPEN)|g' \
               -e 's|@''GNULIB_FSEEK''@|$(GNULIB_FSEEK)|g' \
@@ -653,8 +795,18 @@ stdio.h: stdio.in.h
               -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_PERROR''@|$(GNULIB_PERROR)|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' \
@@ -667,6 +819,8 @@ stdio.h: stdio.in.h
               -e 's|@''REPLACE_VSPRINTF''@|$(REPLACE_VSPRINTF)|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|@''REPLACE_FOPEN''@|$(REPLACE_FOPEN)|g' \
               -e 's|@''REPLACE_FREOPEN''@|$(REPLACE_FREOPEN)|g' \
               -e 's|@''REPLACE_FSEEKO''@|$(REPLACE_FSEEKO)|g' \
@@ -674,16 +828,20 @@ stdio.h: stdio.in.h
               -e 's|@''REPLACE_FTELLO''@|$(REPLACE_FTELLO)|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_GETLINE''@|$(REPLACE_GETLINE)|g' \
+              -e 's|@''REPLACE_PERROR''@|$(REPLACE_PERROR)|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
+EXTRA_DIST += stdio-write.c stdio.in.h
+
+EXTRA_libgnu_a_SOURCES += stdio-write.c
 
 ## end   gnulib module stdio
 
@@ -696,26 +854,44 @@ BUILT_SOURCES += stdlib.h
 stdlib.h: stdlib.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          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|@''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_GETLOADAVG''@|$(GNULIB_GETLOADAVG)|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_RANDOM_R''@|$(GNULIB_RANDOM_R)|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_UNSETENV''@|$(GNULIB_UNSETENV)|g' \
+              -e 's|@''HAVE_ATOLL''@|$(HAVE_ATOLL)|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_RANDOM_R''@|$(HAVE_RANDOM_R)|g' \
+              -e 's|@''HAVE_RPMATCH''@|$(HAVE_RPMATCH)|g' \
               -e 's|@''HAVE_SETENV''@|$(HAVE_SETENV)|g' \
+              -e 's|@''HAVE_STRTOD''@|$(HAVE_STRTOD)|g' \
+              -e 's|@''HAVE_STRTOLL''@|$(HAVE_STRTOLL)|g' \
+              -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_UNSETENV''@|$(HAVE_UNSETENV)|g' \
+              -e 's|@''HAVE_DECL_GETLOADAVG''@|$(HAVE_DECL_GETLOADAVG)|g' \
               -e 's|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
               -e 's|@''REPLACE_PUTENV''@|$(REPLACE_PUTENV)|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)' \
               < $(srcdir)/stdlib.in.h; \
@@ -727,14 +903,12 @@ EXTRA_DIST += stdlib.in.h
 
 ## end   gnulib module stdlib
 
-## begin gnulib module strdup
-
+## begin gnulib module streq
 
-EXTRA_DIST += strdup.c
 
-EXTRA_libgnu_a_SOURCES += strdup.c
+EXTRA_DIST += streq.h
 
-## end   gnulib module strdup
+## end   gnulib module streq
 
 ## begin gnulib module strerror
 
@@ -754,7 +928,8 @@ BUILT_SOURCES += string.h
 string.h: string.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */' && \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_STRING_H''@|$(NEXT_STRING_H)|g' \
               -e 's|@''GNULIB_MBSLEN''@|$(GNULIB_MBSLEN)|g' \
               -e 's|@''GNULIB_MBSNLEN''@|$(GNULIB_MBSNLEN)|g' \
@@ -773,6 +948,7 @@ string.h: string.in.h
               -e 's|@''GNULIB_MEMMEM''@|$(GNULIB_MEMMEM)|g' \
               -e 's|@''GNULIB_MEMPCPY''@|$(GNULIB_MEMPCPY)|g' \
               -e 's|@''GNULIB_MEMRCHR''@|$(GNULIB_MEMRCHR)|g' \
+              -e 's|@''GNULIB_RAWMEMCHR''@|$(GNULIB_RAWMEMCHR)|g' \
               -e 's|@''GNULIB_STPCPY''@|$(GNULIB_STPCPY)|g' \
               -e 's|@''GNULIB_STPNCPY''@|$(GNULIB_STPNCPY)|g' \
               -e 's|@''GNULIB_STRCHRNUL''@|$(GNULIB_STRCHRNUL)|g' \
@@ -786,9 +962,11 @@ string.h: string.in.h
               -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|@''GNULIB_STRVERSCMP''@|$(GNULIB_STRVERSCMP)|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_RAWMEMCHR''@|$(HAVE_RAWMEMCHR)|g' \
               -e 's|@''HAVE_STPCPY''@|$(HAVE_STPCPY)|g' \
               -e 's|@''HAVE_STPNCPY''@|$(HAVE_STPNCPY)|g' \
               -e 's|@''HAVE_STRCHRNUL''@|$(HAVE_STRCHRNUL)|g' \
@@ -802,8 +980,10 @@ string.h: string.in.h
               -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_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_STRSIGNAL''@|$(REPLACE_STRSIGNAL)|g' \
@@ -844,11 +1024,28 @@ BUILT_SOURCES += $(SYS_SOCKET_H)
 sys/socket.h: sys_socket.in.h
         @MKDIR_P@ sys
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|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|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
+              -e 's|@''GNULIB_SOCKET''@|$(GNULIB_SOCKET)|g' \
+              -e 's|@''GNULIB_CONNECT''@|$(GNULIB_CONNECT)|g' \
+              -e 's|@''GNULIB_ACCEPT''@|$(GNULIB_ACCEPT)|g' \
+              -e 's|@''GNULIB_BIND''@|$(GNULIB_BIND)|g' \
+              -e 's|@''GNULIB_GETPEERNAME''@|$(GNULIB_GETPEERNAME)|g' \
+              -e 's|@''GNULIB_GETSOCKNAME''@|$(GNULIB_GETSOCKNAME)|g' \
+              -e 's|@''GNULIB_GETSOCKOPT''@|$(GNULIB_GETSOCKOPT)|g' \
+              -e 's|@''GNULIB_LISTEN''@|$(GNULIB_LISTEN)|g' \
+              -e 's|@''GNULIB_RECV''@|$(GNULIB_RECV)|g' \
+              -e 's|@''GNULIB_SEND''@|$(GNULIB_SEND)|g' \
+              -e 's|@''GNULIB_RECVFROM''@|$(GNULIB_RECVFROM)|g' \
+              -e 's|@''GNULIB_SENDTO''@|$(GNULIB_SENDTO)|g' \
+              -e 's|@''GNULIB_SETSOCKOPT''@|$(GNULIB_SETSOCKOPT)|g' \
+              -e 's|@''GNULIB_SHUTDOWN''@|$(GNULIB_SHUTDOWN)|g' \
               -e 's|@''HAVE_WINSOCK2_H''@|$(HAVE_WINSOCK2_H)|g' \
               -e 's|@''HAVE_WS2TCPIP_H''@|$(HAVE_WS2TCPIP_H)|g' \
+              -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
               < $(srcdir)/sys_socket.in.h; \
         } > $@-t
         mv -f $@-t $@
@@ -869,33 +1066,55 @@ unistd.h: unistd.in.h
         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' \
+              -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_UNISTD_H''@|$(NEXT_UNISTD_H)|g' \
               -e 's|@''GNULIB_CHOWN''@|$(GNULIB_CHOWN)|g' \
+              -e 's|@''GNULIB_CLOSE''@|$(GNULIB_CLOSE)|g' \
               -e 's|@''GNULIB_DUP2''@|$(GNULIB_DUP2)|g' \
+              -e 's|@''GNULIB_ENVIRON''@|$(GNULIB_ENVIRON)|g' \
+              -e 's|@''GNULIB_EUIDACCESS''@|$(GNULIB_EUIDACCESS)|g' \
               -e 's|@''GNULIB_FCHDIR''@|$(GNULIB_FCHDIR)|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_GETHOSTNAME''@|$(GNULIB_GETHOSTNAME)|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_LSEEK''@|$(GNULIB_LSEEK)|g' \
               -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
               -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
+              -e 's|@''GNULIB_UNISTD_H_SIGPIPE''@|$(GNULIB_UNISTD_H_SIGPIPE)|g' \
+              -e 's|@''GNULIB_WRITE''@|$(GNULIB_WRITE)|g' \
               -e 's|@''HAVE_DUP2''@|$(HAVE_DUP2)|g' \
+              -e 's|@''HAVE_EUIDACCESS''@|$(HAVE_EUIDACCESS)|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_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
               -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
+              -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \
               -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
               -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
+              -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|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_CLOSE''@|$(REPLACE_CLOSE)|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' \
+              -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
         mv $@-t $@
@@ -932,6 +1151,12 @@ EXTRA_libgnu_a_SOURCES += asprintf.c vasprintf.c
 
 ## end   gnulib module vasprintf
 
+## begin gnulib module verify
+
+libgnu_a_SOURCES += verify.h
+
+## end   gnulib module verify
+
 ## begin gnulib module vsnprintf
 
 
@@ -950,11 +1175,43 @@ BUILT_SOURCES += $(WCHAR_H)
 wchar.h: wchar.in.h
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
-          sed -e 's/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/g' \
+          sed -e 's|@''INCLUDE_NEXT''@|$(INCLUDE_NEXT)|g' \
+              -e 's|@''PRAGMA_SYSTEM_HEADER''@|@PRAGMA_SYSTEM_HEADER@|g' \
               -e 's|@''NEXT_WCHAR_H''@|$(NEXT_WCHAR_H)|g' \
-              -e 's/@''HAVE_WCHAR_H''@/$(HAVE_WCHAR_H)/g' \
+              -e 's|@''HAVE_WCHAR_H''@|$(HAVE_WCHAR_H)|g' \
+              -e 's|@''GNULIB_BTOWC''@|$(GNULIB_BTOWC)|g' \
+              -e 's|@''GNULIB_WCTOB''@|$(GNULIB_WCTOB)|g' \
+              -e 's|@''GNULIB_MBSINIT''@|$(GNULIB_MBSINIT)|g' \
+              -e 's|@''GNULIB_MBRTOWC''@|$(GNULIB_MBRTOWC)|g' \
+              -e 's|@''GNULIB_MBRLEN''@|$(GNULIB_MBRLEN)|g' \
+              -e 's|@''GNULIB_MBSRTOWCS''@|$(GNULIB_MBSRTOWCS)|g' \
+              -e 's|@''GNULIB_MBSNRTOWCS''@|$(GNULIB_MBSNRTOWCS)|g' \
+              -e 's|@''GNULIB_WCRTOMB''@|$(GNULIB_WCRTOMB)|g' \
+              -e 's|@''GNULIB_WCSRTOMBS''@|$(GNULIB_WCSRTOMBS)|g' \
+              -e 's|@''GNULIB_WCSNRTOMBS''@|$(GNULIB_WCSNRTOMBS)|g' \
               -e 's|@''GNULIB_WCWIDTH''@|$(GNULIB_WCWIDTH)|g' \
+              -e 's|@''HAVE_WINT_T''@|$(HAVE_WINT_T)|g' \
+              -e 's|@''HAVE_BTOWC''@|$(HAVE_BTOWC)|g' \
+              -e 's|@''HAVE_MBSINIT''@|$(HAVE_MBSINIT)|g' \
+              -e 's|@''HAVE_MBRTOWC''@|$(HAVE_MBRTOWC)|g' \
+              -e 's|@''HAVE_MBRLEN''@|$(HAVE_MBRLEN)|g' \
+              -e 's|@''HAVE_MBSRTOWCS''@|$(HAVE_MBSRTOWCS)|g' \
+              -e 's|@''HAVE_MBSNRTOWCS''@|$(HAVE_MBSNRTOWCS)|g' \
+              -e 's|@''HAVE_WCRTOMB''@|$(HAVE_WCRTOMB)|g' \
+              -e 's|@''HAVE_WCSRTOMBS''@|$(HAVE_WCSRTOMBS)|g' \
+              -e 's|@''HAVE_WCSNRTOMBS''@|$(HAVE_WCSNRTOMBS)|g' \
+              -e 's|@''HAVE_DECL_WCTOB''@|$(HAVE_DECL_WCTOB)|g' \
               -e 's|@''HAVE_DECL_WCWIDTH''@|$(HAVE_DECL_WCWIDTH)|g' \
+              -e 's|@''REPLACE_MBSTATE_T''@|$(REPLACE_MBSTATE_T)|g' \
+              -e 's|@''REPLACE_BTOWC''@|$(REPLACE_BTOWC)|g' \
+              -e 's|@''REPLACE_WCTOB''@|$(REPLACE_WCTOB)|g' \
+              -e 's|@''REPLACE_MBSINIT''@|$(REPLACE_MBSINIT)|g' \
+              -e 's|@''REPLACE_MBRTOWC''@|$(REPLACE_MBRTOWC)|g' \
+              -e 's|@''REPLACE_MBRLEN''@|$(REPLACE_MBRLEN)|g' \
+              -e 's|@''REPLACE_MBSRTOWCS''@|$(REPLACE_MBSRTOWCS)|g' \
+              -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
+              -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
+              -e 's|@''REPLACE_WCSRTOMBS''@|$(REPLACE_WCSRTOMBS)|g' \
               -e 's|@''REPLACE_WCWIDTH''@|$(REPLACE_WCWIDTH)|g' \
               -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
             < $(srcdir)/wchar.in.h; \
@@ -966,6 +1223,15 @@ EXTRA_DIST += wchar.in.h
 
 ## end   gnulib module wchar
 
+## begin gnulib module wcrtomb
+
+
+EXTRA_DIST += wcrtomb.c
+
+EXTRA_libgnu_a_SOURCES += wcrtomb.c
+
+## end   gnulib module wcrtomb
+
 ## begin gnulib module wctype
 
 BUILT_SOURCES += $(WCTYPE_H)
@@ -976,10 +1242,12 @@ 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/@''INCLUDE_NEXT''@/$(INCLUDE_NEXT)/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_ISWCNTRL''@/$(HAVE_ISWCNTRL)/g' \
               -e 's/@''HAVE_WINT_T''@/$(HAVE_WINT_T)/g' \
+              -e 's/@''REPLACE_ISWCNTRL''@/$(REPLACE_ISWCNTRL)/g' \
               < $(srcdir)/wctype.in.h; \
         } > $@-t
         mv $@-t $@
@@ -989,6 +1257,15 @@ EXTRA_DIST += wctype.in.h
 
 ## end   gnulib module wctype
 
+## begin gnulib module write
+
+
+EXTRA_DIST += write.c
+
+EXTRA_libgnu_a_SOURCES += write.c
+
+## end   gnulib module write
+
 ## begin gnulib module xalloc