sys_types: Fix typo.

[gnulib.git] / m4 / poll_h.m4

diff --git a/m4/poll_h.m4 b/m4/poll_h.m4
index 6f04168..3f2abf4 100644 (file)
--- a/m4/poll_h.m4
+++ b/m4/poll_h.m4
@@ -1,5 +1,5 @@
-# poll_h.m4 serial 1
-dnl Copyright (C) 2010 Free Software Foundation, Inc.
+# poll_h.m4 serial 2
+dnl Copyright (C) 2010-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.
 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.


@@ -13,9 +13,15 @@ AC_DEFUN([gl_POLL_H],
   AC_REQUIRE([gl_POLL_H_DEFAULTS])
 
   AC_CHECK_HEADERS_ONCE([poll.h])
   AC_REQUIRE([gl_POLL_H_DEFAULTS])
 
   AC_CHECK_HEADERS_ONCE([poll.h])

-  if test $ac_cv_header_poll_h != yes; then
-    gl_REPLACE_POLL_H
+  if test $ac_cv_header_poll_h = yes; then
+    HAVE_POLL_H=1
+  else
+    HAVE_POLL_H=0

   fi
   fi

+  AC_SUBST([HAVE_POLL_H])
+
+  dnl <poll.h> is always overridden, because of GNULIB_POSIXCHECK.
+  gl_CHECK_NEXT_HEADERS([poll.h])

 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.
 
   dnl Check for declarations of anything we want to poison if the
   dnl corresponding gnulib module is not in use.


@@ -23,13 +29,6 @@ AC_DEFUN([gl_POLL_H],
     [poll])
 ])
 
     [poll])
 ])
 

-dnl Unconditionally enables the replacement of <poll.h>.
-AC_DEFUN([gl_REPLACE_POLL_H],
-[
-  AC_REQUIRE([gl_POLL_H_DEFAULTS])
-  POLL_H='poll.h'
-])
-

 AC_DEFUN([gl_POLL_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.
 AC_DEFUN([gl_POLL_MODULE_INDICATOR],
 [
   dnl Use AC_REQUIRE here, so that the default settings are expanded once only.


@@ -43,7 +42,6 @@ AC_DEFUN([gl_POLL_H_DEFAULTS],
 [
   GNULIB_POLL=0;        AC_SUBST([GNULIB_POLL])
   dnl Assume proper GNU behavior unless another module says otherwise.
 [
   GNULIB_POLL=0;        AC_SUBST([GNULIB_POLL])
   dnl Assume proper GNU behavior unless another module says otherwise.

-  POLL_H='';            AC_SUBST([POLL_H])

   HAVE_POLL=1;          AC_SUBST([HAVE_POLL])
   REPLACE_POLL=0;       AC_SUBST([REPLACE_POLL])
 ])
   HAVE_POLL=1;          AC_SUBST([HAVE_POLL])
   REPLACE_POLL=0;       AC_SUBST([REPLACE_POLL])
 ])