X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=modules%2Fsocket;h=f5daa4919bd1cb342e6d8f6f92ea806ab92aab49;hb=2c69dae3c3108c58813a89ded73496c6fba33175;hp=070ba3f2f03b7226645b505369322ea4b94fea72;hpb=11ee0e1340f95ccb9954e522f6e003b3125eb109;p=gnulib.git

diff --git a/modules/socket b/modules/socket
index 070ba3f2f..f5daa4919 100644
--- a/modules/socket
+++ b/modules/socket
@@ -8,12 +8,22 @@ 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([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])
 
 Makefile.am: