--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2005-09-08  Simon Josefsson  <jas@extundo.com>
+
+	* modules/socklen: New file.
+
 2005-09-05  Bruno Haible  <bruno@clisp.org>
 
 	* gnulib-tool (func_import): Fix comparison in handling of symbolic

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,7 @@
+2005-08-31  Simon Josefsson  <jas@extundo.com>
+
+	* socklen.m4: New file.
+
 2005-09-03  Derek Price  <derek@ximbiot.com>
 
 	* getlogin_r (gl_GETLOGIN_R): Fix cut & paste error.

new file mode 100644
--- /dev/null
+++ b/m4/socklen.m4
@@ -0,0 +1,20 @@
+# 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)
+])

new file mode 100644
--- /dev/null
+++ b/modules/socklen
@@ -0,0 +1,20 @@
+Description:
+Declare socklen_t in config.h if the system doesn't have it.
+
+Files:
+m4/socklen.m4
+
+Depends-on:
+
+configure.ac:
+gl_SOCKLEN_T
+
+Makefile.am:
+
+Include:
+
+License:
+unlimited
+
+Maintainer:
+Simon Josefsson