X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsocket;h=f5daa4919bd1cb342e6d8f6f92ea806ab92aab49;hb=e29e3289d862d3fd69a9b74cbff6668262241f24;hp=900d9ec95d5ef0c2a0a72329ea8be996d24a3f1f;hpb=44656541e5be621a9430633f8c3a4fdea64d284d;p=gnulib.git

diff --git a/modules/socket b/modules/socket
index 900d9ec95..f5daa4919 100644
--- a/modules/socket
+++ b/modules/socket
@@ -2,16 +2,27 @@ Description:
 socket() function: create a socket.
 
 Files:
-lib/winsock.c
+lib/socket.c
+lib/w32sock.h
 
 Depends-on:
 sys_socket
 errno
+sockets
 
 configure.ac:
 AC_REQUIRE([gl_HEADER_SYS_SOCKET])
 if test "$ac_cv_header_winsock2_h" = yes; then
-  AC_LIBOBJ([winsock])
+  AC_LIBOBJ([socket])
+fi
+# When this module is used, sockets may actually occur as file descriptors,
+# hence it is worth warning if the modules 'close' and 'ioctl' are not used.
+m4_ifdef([gl_UNISTD_H_DEFAULTS], [AC_REQUIRE([gl_UNISTD_H_DEFAULTS])])
+m4_ifdef([gl_SYS_IOCTL_H_DEFAULTS], [AC_REQUIRE([gl_SYS_IOCTL_H_DEFAULTS])])
+AC_REQUIRE([gl_PREREQ_SYS_H_WINSOCK2])
+if test "$ac_cv_header_winsock2_h" = yes; then
+  UNISTD_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
+  SYS_IOCTL_H_HAVE_WINSOCK2_H_AND_USE_SOCKETS=1
 fi
 gl_SYS_SOCKET_MODULE_INDICATOR([socket])