diff options
| author | Bruno Haible <bruno@clisp.org> | 2010-09-29 01:51:18 +0200 |
|---|---|---|
| committer | Bruno Haible <bruno@clisp.org> | 2010-09-29 01:51:18 +0200 |
| commit | 55898ee1c7c12e63772c65e772577f10bb7adb31 (patch) | |
| tree | d9e67d9bd0af9ed66256cd4712f2b4a33a8e0801 /m4/poll_h.m4 | |
| parent | bea1da6a318af6345db504c70ddb873c12501699 (diff) | |
| download | gnulib-55898ee1c7c12e63772c65e772577f10bb7adb31.tar.gz | |
poll-h: Create poll.h on all platforms.
* lib/poll.in.h: Use double-inclusion guard. Don't define POLL*,
struct pollfd, nfds_t, INFTIM when the system has <poll.h>.
* m4/poll_h.m4 (gl_POLL_H): Set HAVE_POLL_H. Invoke
gl_CHECK_NEXT_HEADERS. Don't set POLL_H.
(gl_REPLACE_POLL_H): Don't set POLL_H.
(gl_POLL_H_DEFAULTS): Don't initialize POLL_H.
* modules/poll-h (Depends-on): Add include_next.
(Makefile.am): Create poll.h unconditionally. Substitute also
HAVE_POLL_H, INCLUDE_NEXT, PRAGMA_SYSTEM_HEADER, NEXT_POLL_H.
Diffstat (limited to 'm4/poll_h.m4')
| -rw-r--r-- | m4/poll_h.m4 | 14 |
1 files changed, 10 insertions, 4 deletions
diff --git a/m4/poll_h.m4 b/m4/poll_h.m4 index 6f041689ac..2ae995a0f5 100644 --- a/m4/poll_h.m4 +++ b/m4/poll_h.m4 @@ -13,9 +13,16 @@ AC_DEFUN([gl_POLL_H], AC_REQUIRE([gl_POLL_H_DEFAULTS]) AC_CHECK_HEADERS_ONCE([poll.h]) - if test $ac_cv_header_poll_h != yes; then + if test $ac_cv_header_poll_h = yes; then + HAVE_POLL_H=1 + else + HAVE_POLL_H=0 gl_REPLACE_POLL_H 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. @@ -26,8 +33,8 @@ AC_DEFUN([gl_POLL_H], dnl Unconditionally enables the replacement of <poll.h>. AC_DEFUN([gl_REPLACE_POLL_H], [ - AC_REQUIRE([gl_POLL_H_DEFAULTS]) - POLL_H='poll.h' + dnl This is a no-op, because <poll.h> is always overridden. + : ]) AC_DEFUN([gl_POLL_MODULE_INDICATOR], @@ -43,7 +50,6 @@ AC_DEFUN([gl_POLL_H_DEFAULTS], [ 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]) ]) |