X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fselect.m4;h=d9c3465b12889e9923385039de2045c7d60b39ac;hb=50933cccef270ca1f2d948700913830dba0b9a06;hp=53cc059656cc424eb745c455c61e8d04eb473d3b;hpb=30dccb610124997ff5776d80979d24375f39b12a;p=gnulib.git

diff --git a/m4/select.m4 b/m4/select.m4
index 53cc05965..d9c3465b1 100644
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,5 +1,5 @@
-# select.m4 serial 2
-dnl Copyright (C) 2009 Free Software Foundation, Inc.
+# select.m4 serial 5
+dnl Copyright (C) 2009-2011 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.
@@ -8,8 +8,9 @@ AC_DEFUN([gl_FUNC_SELECT],
 [
   AC_REQUIRE([gl_HEADER_SYS_SELECT])
   AC_REQUIRE([AC_CANONICAL_HOST]) dnl for cross-compiles
+  AC_REQUIRE([gl_SOCKETS])
   if test "$ac_cv_header_winsock2_h" = yes; then
-    AC_LIBOBJ([select])
+    REPLACE_SELECT=1
   else
     dnl On Interix 3.5, select(0, NULL, NULL, NULL, timeout) fails with error
     dnl EFAULT.
@@ -43,10 +44,7 @@ changequote([,])dnl
       ])
     case "$gl_cv_func_select_supports0" in
       *yes) ;;
-      *)
-        REPLACE_SELECT=1
-        AC_LIBOBJ([select])
-        ;;
+      *) REPLACE_SELECT=1 ;;
     esac
   fi
 ])