Merge commit 'a39d4083cab589d7cd6a13e8a4b8db8875261d75'

[gnulib.git] / modules / ioctl

diff --git a/modules/ioctl b/modules/ioctl
index 57328f3..ba4a85a 100644 (file)
--- a/modules/ioctl
+++ b/modules/ioctl
@@ -8,12 +8,16 @@ m4/ioctl.m4
 
 Depends-on:
 sys_ioctl
-sys_socket      [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL = 1]
-errno           [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL = 1]
-fd-hook         [test "$ac_cv_header_winsock2_h" = yes || test $REPLACE_IOCTL = 1]
+sys_socket      [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
+errno           [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
+fd-hook         [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
+msvc-nothrow    [test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1]
 
 configure.ac:
 gl_FUNC_IOCTL
+if test $HAVE_IOCTL = 0 || test $REPLACE_IOCTL = 1; then
+  AC_LIBOBJ([ioctl])
+fi
 gl_SYS_IOCTL_MODULE_INDICATOR([ioctl])
 
 Makefile.am: