Update gnulib files.

5 files changed, 133 insertions, 1 deletions

diff --git a/gl/gnulib.mk b/gl/gnulib.mk
index 640d7a10bf..ac14a2de26 100644
--- a/gl/gnulib.mk
+++ b/gl/gnulib.mk
@@ -22,6 +22,15 @@ libgnu_la_DEPENDENCIES = $(gl_LTLIBOBJS)
 EXTRA_libgnu_la_SOURCES =
 libgnu_la_LDFLAGS = $(AM_LDFLAGS)
 
+## 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 arpa_inet
 
 BUILT_SOURCES += $(ARPA_INET_H)
@@ -155,6 +164,15 @@ EXTRA_DIST += $(top_srcdir)/build-aux/GNUmakefile $(top_srcdir)/build-aux/maint.
 
 ## end   gnulib module maintainer-makefile
 
+## begin gnulib module malloc-posix
+
+
+EXTRA_DIST += malloc.c
+
+EXTRA_libgnu_la_SOURCES += malloc.c
+
+## end   gnulib module malloc-posix
+
 ## begin gnulib module netinet_in
 
 BUILT_SOURCES += $(NETINET_IN_H)
@@ -193,6 +211,15 @@ EXTRA_libgnu_la_SOURCES += readline.c
 
 ## end   gnulib module readline
 
+## begin gnulib module realloc-posix
+
+
+EXTRA_DIST += realloc.c
+
+EXTRA_libgnu_la_SOURCES += realloc.c
+
+## end   gnulib module realloc-posix
+
 ## begin gnulib module stdbool
 
 BUILT_SOURCES += $(STDBOOL_H)
@@ -268,6 +295,39 @@ EXTRA_DIST += stdio_.h
 
 ## end   gnulib module stdio
 
+## begin gnulib module stdlib
+
+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_.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|@''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|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/stdlib_.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+
+EXTRA_DIST += stdlib_.h
+
+## end   gnulib module stdlib
+
 ## begin gnulib module strdup
 
 
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index bbe54c1758..914e68f689 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -62,13 +62,18 @@ AC_DEFUN([gl_INIT],
   gl_INET_PTON
   gl_FUNC_LSEEK
   gl_UNISTD_MODULE_INDICATOR([lseek])
+  gl_FUNC_MALLOC_POSIX
+  gl_STDLIB_MODULE_INDICATOR([malloc-posix])
   gl_HEADER_NETINET_IN
   AC_PROG_MKDIR_P
   gl_FUNC_READLINE
+  gl_FUNC_REALLOC_POSIX
+  gl_STDLIB_MODULE_INDICATOR([realloc-posix])
   gl_TYPE_SOCKLEN_T
   gl_STDARG_H
   AM_STDBOOL_H
   gl_STDIO_H
+  gl_STDLIB_H
   gl_FUNC_STRDUP
   gl_STRING_MODULE_INDICATOR([strdup])
   gl_HEADER_STRING_H
@@ -137,13 +142,16 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/inet_pton.c
   lib/inet_pton.h
   lib/lseek.c
+  lib/malloc.c
   lib/netinet_in_.h
   lib/progname.c
   lib/progname.h
   lib/readline.c
   lib/readline.h
+  lib/realloc.c
   lib/stdbool_.h
   lib/stdio_.h
+  lib/stdlib_.h
   lib/strdup.c
   lib/string_.h
   lib/sys_socket_.h
@@ -151,6 +159,7 @@ AC_DEFUN([gl_FILE_LIST], [
   lib/version-etc-fsf.c
   lib/version-etc.c
   lib/version-etc.h
+  m4/absolute-header.m4
   m4/arpa_inet_h.m4
   m4/error.m4
   m4/extensions.m4
@@ -167,13 +176,16 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/lib-link.m4
   m4/lib-prefix.m4
   m4/lseek.m4
+  m4/malloc.m4
   m4/netinet_in_h.m4
   m4/readline.m4
+  m4/realloc.m4
   m4/socklen.m4
   m4/sockpfaf.m4
   m4/stdarg.m4
   m4/stdbool.m4
   m4/stdio_h.m4
+  m4/stdlib_h.m4
   m4/strdup.m4
   m4/string_h.m4
   m4/sys_socket_h.m4
diff --git a/lgl/Makefile.am b/lgl/Makefile.am
index 53d78248a6..703701a48a 100644
--- a/lgl/Makefile.am
+++ b/lgl/Makefile.am
@@ -35,6 +35,15 @@ liblgnu_la_DEPENDENCIES = $(lgl_LTLIBOBJS)
 EXTRA_liblgnu_la_SOURCES =
 liblgnu_la_LDFLAGS = $(AM_LDFLAGS)
 
+## 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-opt
 
 BUILT_SOURCES += $(ALLOCA_H)
@@ -254,6 +263,15 @@ EXTRA_liblgnu_la_SOURCES += read-file.c
 
 ## end   gnulib module read-file
 
+## begin gnulib module realloc-posix
+
+
+EXTRA_DIST += realloc.c
+
+EXTRA_liblgnu_la_SOURCES += realloc.c
+
+## end   gnulib module realloc-posix
+
 ## begin gnulib module size_max
 
 liblgnu_la_SOURCES += size_max.h
@@ -384,6 +402,39 @@ EXTRA_DIST += stdio_.h
 
 ## end   gnulib module stdio
 
+## begin gnulib module stdlib
+
+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_.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|@''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|@''REPLACE_MKSTEMP''@|$(REPLACE_MKSTEMP)|g' \
+	      -e '/definition of GL_LINK_WARNING/r $(LINK_WARNING_H)' \
+	      < $(srcdir)/stdlib_.h; \
+	} > $@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += stdlib.h stdlib.h-t
+
+EXTRA_DIST += stdlib_.h
+
+## end   gnulib module stdlib
+
 ## begin gnulib module string
 
 BUILT_SOURCES += string.h
diff --git a/lgl/m4/gnulib-comp.m4 b/lgl/m4/gnulib-comp.m4
index b9078478e0..10e3e26fe8 100644
--- a/lgl/m4/gnulib-comp.m4
+++ b/lgl/m4/gnulib-comp.m4
@@ -79,6 +79,8 @@ AC_DEFUN([lgl_INIT],
   gl_FUNC_MEMMOVE
   gl_MINMAX
   gl_FUNC_READ_FILE
+  gl_FUNC_REALLOC_POSIX
+  gl_STDLIB_MODULE_INDICATOR([realloc-posix])
   gl_SIZE_MAX
   gl_FUNC_SNPRINTF
   gl_STDIO_MODULE_INDICATOR([snprintf])
@@ -86,6 +88,7 @@ AC_DEFUN([lgl_INIT],
   AM_STDBOOL_H
   gl_STDINT_H
   gl_STDIO_H
+  gl_STDLIB_H
   gl_HEADER_STRING_H
   gl_FUNC_STRVERSCMP
   gl_HEADER_SYS_SOCKET
@@ -176,6 +179,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   lib/printf-parse.h
   lib/read-file.c
   lib/read-file.h
+  lib/realloc.c
   lib/rijndael-alg-fst.c
   lib/rijndael-alg-fst.h
   lib/rijndael-api-fst.c
@@ -187,6 +191,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   lib/stdbool_.h
   lib/stdint_.h
   lib/stdio_.h
+  lib/stdlib_.h
   lib/string_.h
   lib/strverscmp.c
   lib/strverscmp.h
@@ -200,6 +205,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   lib/vasprintf.c
   lib/wchar_.h
   lib/xsize.h
+  m4/absolute-header.m4
   m4/alloca.m4
   m4/arcfour.m4
   m4/arctwo.m4
@@ -243,6 +249,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   m4/lib-prefix.m4
   m4/lock.m4
   m4/longlong.m4
+  m4/malloc.m4
   m4/md2.m4
   m4/md4.m4
   m4/md5.m4
@@ -255,6 +262,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   m4/printf-posix.m4
   m4/progtest.m4
   m4/read-file.m4
+  m4/realloc.m4
   m4/rijndael.m4
   m4/sha1.m4
   m4/size_max.m4
@@ -265,6 +273,7 @@ AC_DEFUN([lgl_FILE_LIST], [
   m4/stdint.m4
   m4/stdint_h.m4
   m4/stdio_h.m4
+  m4/stdlib_h.m4
   m4/string_h.m4
   m4/strverscmp.m4
   m4/sys_socket_h.m4
diff --git a/lgl/m4/time_h.m4 b/lgl/m4/time_h.m4
index 3f543a15a7..d42a635ece 100644
--- a/lgl/m4/time_h.m4
+++ b/lgl/m4/time_h.m4
@@ -65,7 +65,7 @@ AC_DEFUN([gl_CHECK_TYPE_STRUCT_TIMESPEC],
 	    [[static struct timespec x; x.tv_sec = x.tv_nsec;]])],
 	 [gl_cv_sys_struct_timespec_in_sys_time_h=yes],
 	 [gl_cv_sys_struct_timespec_in_sys_time_h=no])])
-    if test $gl_cv_sys_struct_timespec_in_time_h = yes; then
+    if test $gl_cv_sys_struct_timespec_in_sys_time_h = yes; then
       SYS_TIME_H_DEFINES_STRUCT_TIMESPEC=1
     fi
   fi