X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;f=m4%2Fsys_select_h.m4;h=e521a90df008fbaba3b043312a15feae222d2b68;hb=062cad2d07081f9a60adbb90fc1184a435a1a93f;hp=590554a11f285d770cdbfbdf61c907c82d930bc9;hpb=cbd5934b1918d73022d1d1d9904112f3d6d7f187;p=gnulib.git

diff --git a/m4/sys_select_h.m4 b/m4/sys_select_h.m4
index 590554a11..e521a90df 100644
--- a/m4/sys_select_h.m4
+++ b/m4/sys_select_h.m4
@@ -1,4 +1,4 @@
-# sys_select_h.m4 serial 11
+# sys_select_h.m4 serial 13
 dnl Copyright (C) 2006-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,
@@ -46,6 +46,7 @@ AC_DEFUN([gl_HEADER_SYS_SELECT],
       fi
     ])
   AC_CHECK_HEADERS_ONCE([sys/select.h])
+  dnl <sys/select.h> is always overridden, because of GNULIB_POSIXCHECK.
   gl_CHECK_NEXT_HEADERS([sys/select.h])
   if test $ac_cv_header_sys_select_h = yes; then
     HAVE_SYS_SELECT_H=1
@@ -53,9 +54,7 @@ AC_DEFUN([gl_HEADER_SYS_SELECT],
     HAVE_SYS_SELECT_H=0
   fi
   AC_SUBST([HAVE_SYS_SELECT_H])
-  if test $gl_cv_header_sys_select_h_selfcontained != yes; then
-    gl_PREREQ_SYS_H_WINSOCK2
-  fi
+  gl_PREREQ_SYS_H_WINSOCK2
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
@@ -74,6 +73,8 @@ AC_DEFUN([gl_SYS_SELECT_MODULE_INDICATOR],
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
   AC_REQUIRE([gl_SYS_SELECT_H_DEFAULTS])
   GNULIB_[]m4_translit([$1],[abcdefghijklmnopqrstuvwxyz./-],[ABCDEFGHIJKLMNOPQRSTUVWXYZ___])=1
+  dnl Define it also as a C macro, for the benefit of the unit tests.
+  gl_MODULE_INDICATOR([$1])
 ])
 
 AC_DEFUN([gl_SYS_SELECT_H_DEFAULTS],