--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-27  Simon Josefsson  <jas@extundo.com>
+
+	* modules/sys_select: New file, suggested by Paul Eggert and
+	Martin Lambers.
+
 2006-06-26  Bruno Haible  <bruno@clisp.org>
 
 	* modules/stdint (Makefile.am): Also substitute HAVE_WCHAR_H.

--- a/m4/ChangeLog
+++ b/m4/ChangeLog
@@ -1,3 +1,8 @@
+2006-06-27  Simon Josefsson  <jas@extundo.com>
+
+	* sys_select_h.m4: New file, suggested by Paul Eggert and Martin
+	Lambers.
+
 2006-06-27  Bruno Haible  <bruno@clisp.org>
 
 	* stdint.m4 (gl_STDINT_BITSIZEOF): For nonexistent types, set the

new file mode 100644
--- /dev/null
+++ b/m4/sys_select_h.m4
@@ -0,0 +1,18 @@
+# sys_select_h.m4 serial 1
+dnl Copyright (C) 2006 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 Adapted from arpa_inet.m4, written by Simon Josefsson.
+
+AC_DEFUN([gl_HEADER_SYS_SELECT],
+[
+  AC_CHECK_HEADERS_ONCE([sys/select.h])
+  if test $ac_cv_header_sys_select_h = yes; then
+    SYS_SELECT_H=''
+  else
+    SYS_SELECT_H='sys/select.h'
+  fi
+  AC_SUBST(SYS_SELECT_H)
+])

new file mode 100644
--- /dev/null
+++ b/modules/sys_select
@@ -0,0 +1,32 @@
+Description:
+A <sys/select.h> for systems lacking it (e.g., Mingw).
+
+Files:
+m4/sys_select_h.m4
+
+Depends-on:
+sys_socket
+
+configure.ac:
+gl_HEADER_SYS_SELECT
+
+Makefile.am:
+BUILT_SOURCES += $(SYS_SELECT_H)
+
+# We need the following in order to create <sys/select.h> when the system
+# doesn't have one that works with the given compiler.
+sys/select.h:
+	test -d sys || mkdir sys
+	echo '#include <sys/socket.h>' >$@-t
+	mv $@-t $@
+MOSTLYCLEANFILES += sys/select.h sys/select.h-t
+MOSTLYCLEANDIRS += sys
+
+Include:
+#include <sys/select.h>
+
+License:
+LGPL
+
+Maintainer:
+Simon Josefsson