1 files changed, 56 insertions, 7 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index cae814fd..87fe0316 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -28,6 +28,7 @@ MAINTAINERCLEANFILES =
 EXTRA_DIST += m4/gnulib-cache.m4
 
 AM_CPPFLAGS =
+AM_CFLAGS =
 
 noinst_LIBRARIES += libgnu.a
 
@@ -36,6 +37,13 @@ libgnu_a_LIBADD = $(gl_LIBOBJS)
 libgnu_a_DEPENDENCIES = $(gl_LIBOBJS)
 EXTRA_libgnu_a_SOURCES =
 
+## begin gnulib module alignof
+
+
+EXTRA_DIST += alignof.h
+
+## end   gnulib module alignof
+
 ## begin gnulib module alloca
 
 
@@ -70,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:
+arpa/inet.h: arpa_inet.in.h
         @MKDIR_P@ arpa
         rm -f $@-t $@
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
@@ -146,7 +154,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 $@
+        rm -f $@-t
         { echo '/* DO NOT EDIT! GENERATED AUTOMATICALLY! */'; \
           echo '#define PREFIX "$(prefix)"'; \
           echo '#define EXEC_PREFIX "$(exec_prefix)"'; \
@@ -176,7 +184,12 @@ configmake.h: Makefile
           echo '#define PKGLIBDIR "$(pkglibdir)"'; \
           echo '#define PKGLIBEXECDIR "$(pkglibexecdir)"'; \
         } | sed '/""/d' > $@-t
-        mv $@-t $@
+        if test -f $@ && cmp $@-t $@ > /dev/null; then \
+          rm -f $@-t; \
+        else \
+          rm -f $@; mv $@-t $@; \
+        fi
+
 BUILT_SOURCES += configmake.h
 CLEANFILES += configmake.h configmake.h-t
 
@@ -433,21 +446,37 @@ 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)
+install-exec-local: install-exec-localcharset
+install-exec-localcharset: all-local
+        if test $(GLIBC21) = no; then \
+          case '$(host_os)' in \
+            darwin[56]*) \
+              need_charset_alias=true ;; \
+            darwin* | cygwin* | mingw* | pw32* | cegcc*) \
+              need_charset_alias=false ;; \
+            *) \
+              need_charset_alias=true ;; \
+          esac ; \
+        else \
+          need_charset_alias=false ; \
+        fi ; \
+        if $$need_charset_alias; then \
+          $(mkinstalldirs) $(DESTDIR)$(libdir) ; \
+        fi ; \
         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 \
+          if $$need_charset_alias; 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
+uninstall-local: uninstall-localcharset
+uninstall-localcharset: 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) \
@@ -794,6 +823,8 @@ stdio.h: stdio.in.h
               -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' \
@@ -826,6 +857,10 @@ stdio.h: stdio.in.h
               -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_VASPRINTF''@|$(HAVE_VASPRINTF)|g' \
               -e 's|@''REPLACE_VASPRINTF''@|$(REPLACE_VASPRINTF)|g' \
               -e 's|@''HAVE_DECL_OBSTACK_PRINTF''@|$(HAVE_DECL_OBSTACK_PRINTF)|g' \
@@ -866,6 +901,7 @@ stdlib.h: stdlib.in.h
           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' \
@@ -912,6 +948,15 @@ EXTRA_DIST += stdlib.in.h
 
 ## end   gnulib module stdlib
 
+## begin gnulib module strdup-posix
+
+
+EXTRA_DIST += strdup.c
+
+EXTRA_libgnu_a_SOURCES += strdup.c
+
+## end   gnulib module strdup-posix
+
 ## begin gnulib module streq
 
 
@@ -1054,6 +1099,7 @@ sys/socket.h: sys_socket.in.h
               -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 's|@''HAVE_STRUCT_SOCKADDR_STORAGE''@|$(HAVE_STRUCT_SOCKADDR_STORAGE)|g' \
               -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
               < $(srcdir)/sys_socket.in.h; \
         } > $@-t
@@ -1139,6 +1185,7 @@ unistd.h: unistd.in.h
               -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_LSEEK''@|$(GNULIB_LSEEK)|g' \
               -e 's|@''GNULIB_READLINK''@|$(GNULIB_READLINK)|g' \
               -e 's|@''GNULIB_SLEEP''@|$(GNULIB_SLEEP)|g' \
@@ -1153,6 +1200,7 @@ unistd.h: unistd.in.h
               -e 's|@''HAVE_GETHOSTNAME''@|$(HAVE_GETHOSTNAME)|g' \
               -e 's|@''HAVE_GETPAGESIZE''@|$(HAVE_GETPAGESIZE)|g' \
               -e 's|@''HAVE_GETUSERSHELL''@|$(HAVE_GETUSERSHELL)|g' \
+              -e 's|@''HAVE_LINK''@|$(HAVE_LINK)|g' \
               -e 's|@''HAVE_READLINK''@|$(HAVE_READLINK)|g' \
               -e 's|@''HAVE_SLEEP''@|$(HAVE_SLEEP)|g' \
               -e 's|@''HAVE_DECL_ENVIRON''@|$(HAVE_DECL_ENVIRON)|g' \
@@ -1266,6 +1314,7 @@ wchar.h: wchar.in.h
               -e 's|@''REPLACE_MBSNRTOWCS''@|$(REPLACE_MBSNRTOWCS)|g' \
               -e 's|@''REPLACE_WCRTOMB''@|$(REPLACE_WCRTOMB)|g' \
               -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)' \
             < $(srcdir)/wchar.in.h; \