Update.

4 files changed, 27 insertions, 7 deletions

diff --git a/gl/Makefile.am b/gl/Makefile.am
index 89b1563e8b..ad2e0b0908 100644
--- a/gl/Makefile.am
+++ b/gl/Makefile.am
@@ -8,7 +8,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 --aux-dir=. --lgpl --libtool --macro-prefix=gl error getline getpass memmem memmove minmax readline snprintf
+# Reproduce by: gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl error getline getpass memmem memmove minmax readline snprintf socklen
 
 AUTOMAKE_OPTIONS = 1.5 gnits no-dependencies
 
diff --git a/gl/m4/gnulib-cache.m4 b/gl/m4/gnulib-cache.m4
index c6e7197f78..0a5df528c9 100644
--- a/gl/m4/gnulib-cache.m4
+++ b/gl/m4/gnulib-cache.m4
@@ -14,16 +14,15 @@
 
 
 # Specification in the form of a command-line invocation:
-#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl error getline getpass memmem memmove minmax readline snprintf
+#   gnulib-tool --import --dir=. --lib=libgnu --source-base=gl --m4-base=gl/m4 --aux-dir=. --lgpl --libtool --macro-prefix=gl error getline getpass memmem memmove minmax readline snprintf socklen
 
 # Specification in the form of a few gnulib-tool.m4 macro invocations:
-gl_MODULES([error getline getpass memmem memmove minmax readline snprintf])
+gl_MODULES([error getline getpass memmem memmove minmax readline snprintf socklen])
 gl_AVOID([])
 gl_SOURCE_BASE([gl])
 gl_M4_BASE([gl/m4])
+gl_TESTS_BASE([gl/tests])
 gl_LIB([libgnu])
 gl_LGPL
 gl_LIBTOOL
 gl_MACRO_PREFIX([gl])
-
-# gnulib-cache.m4 ends here
diff --git a/gl/m4/gnulib-comp.m4 b/gl/m4/gnulib-comp.m4
index bae37d4709..a34f8ee176 100644
--- a/gl/m4/gnulib-comp.m4
+++ b/gl/m4/gnulib-comp.m4
@@ -36,6 +36,7 @@ AC_DEFUN([gl_INIT],
   gl_FUNC_READLINE
   gl_SIZE_MAX
   gl_FUNC_SNPRINTF
+  gl_SOCKLEN_T
   AM_STDBOOL_H
   gl_FUNC_VASNPRINTF
   gl_XSIZE
@@ -92,6 +93,7 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/signed.m4
   m4/size_max.m4
   m4/snprintf.m4
+  m4/socklen.m4
   m4/stdbool.m4
   m4/stdint_h.m4
   m4/strerror_r.m4
@@ -100,5 +102,3 @@ AC_DEFUN([gl_FILE_LIST], [
   m4/wint_t.m4
   m4/xsize.m4
 ])
-
-# gnulib-comp.m4 ends here
diff --git a/gl/m4/socklen.m4 b/gl/m4/socklen.m4
new file mode 100644
index 0000000000..c26a2813a4
--- /dev/null
+++ b/gl/m4/socklen.m4
@@ -0,0 +1,21 @@
+# socklen.m4 serial 1
+dnl Copyright (C) 2005 Free Software Foundation, Inc.
+dnl This file is free software; the Free Software Foundation
+dnl gives unlimited permission to copy and/or distribute it,
+dnl with or without modifications, as long as this notice is preserved.
+
+dnl From Simon Josefsson.
+
+AC_DEFUN([gl_SOCKLEN_T],
+[
+  AC_CHECK_HEADERS_ONCE(sys/types.h sys/socket.h)
+  AC_CHECK_TYPE([socklen_t],, [AC_DEFINE([socklen_t], [int],
+                [Map `socklen_t' to `int' if it is missing.])], [
+#ifdef HAVE_SYS_TYPES_H
+# include <sys/types.h>
+#endif
+#ifdef HAVE_SYS_SOCKET_H
+# include <sys/socket.h>
+#endif)
+])
+])