fts: add/use new struct member, fts_dirp

[gnulib.git] / m4 / select.m4

diff --git a/m4/select.m4 b/m4/select.m4
index 5397df0..d9c3465 100644 (file)
--- a/m4/select.m4
+++ b/m4/select.m4
@@ -1,5 +1,5 @@
-# select.m4 serial 1
-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.
@@ -17,7 +18,7 @@ AC_DEFUN([gl_FUNC_SELECT],
     AC_CACHE_CHECK([whether select supports a 0 argument],
       [gl_cv_func_select_supports0],
       [
-        AC_TRY_RUN([
+        AC_RUN_IFELSE([AC_LANG_SOURCE([[
 #include <sys/types.h>
 #include <sys/time.h>
 #if HAVE_SYS_SELECT_H
@@ -29,7 +30,7 @@ int main ()
   timeout.tv_sec = 0;
   timeout.tv_usec = 5;
   return select (0, (fd_set *)0, (fd_set *)0, (fd_set *)0, &timeout) < 0;
-}], [gl_cv_func_select_supports0=yes], [gl_cv_func_select_supports0=no],
+}]])], [gl_cv_func_select_supports0=yes], [gl_cv_func_select_supports0=no],
           [
 changequote(,)dnl
            case "$host_os" in
@@ -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
 ])