X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fclose.m4;h=1ee3add9b998a2c33893357e6af73201842519a0;hb=32a3eff7f5191d76a82be7db1190a98ed9ef55d0;hp=edfcfec59accd6d29ace135c002ca5adf29603f8;hpb=d638ad2325cc24731a6deda2cb8d530d1c380a3a;p=gnulib.git

diff --git a/m4/close.m4 b/m4/close.m4
index edfcfec59..1ee3add9b 100644
--- a/m4/close.m4
+++ b/m4/close.m4
@@ -1,19 +1,26 @@
-# close.m4 serial 1
-dnl Copyright (C) 2008 Free Software Foundation, Inc.
+# close.m4 serial 5
+dnl Copyright (C) 2008-2010 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.
 
 AC_DEFUN([gl_FUNC_CLOSE],
 [
-  :
+  m4_ifdef([gl_PREREQ_SYS_H_WINSOCK2], [
+    gl_PREREQ_SYS_H_WINSOCK2
+    if test $UNISTD_H_HAVE_WINSOCK2_H = 1; then
+      dnl Even if the 'socket' module is not used here, another part of the
+      dnl application may use it and pass file descriptors that refer to
+      dnl sockets to the close() function. So enable the support for sockets.
+      gl_REPLACE_CLOSE
+    fi
+  ])
 ])
 
 AC_DEFUN([gl_REPLACE_CLOSE],
 [
   AC_REQUIRE([gl_UNISTD_H_DEFAULTS])
-  if test $REPLACE_CLOSE != 1; then
-    AC_LIBOBJ([close])
-  fi
   REPLACE_CLOSE=1
+  AC_LIBOBJ([close])
+  gl_REPLACE_FCLOSE
 ])