X-Git-Url: http://erislabs.net/gitweb/?a=blobdiff_plain;ds=sidebyside;f=m4%2Fpoll.m4;h=d226e1c01160337d3f98ca1c025c23a5d1f3681a;hb=ef3ff90a39110bde148b63b18b997c317eee9751;hp=c427b09f5d9794a4e32ef481fcab31a4873f420c;hpb=30dccb610124997ff5776d80979d24375f39b12a;p=gnulib.git diff --git a/m4/poll.m4 b/m4/poll.m4 index c427b09f5..d226e1c01 100644 --- a/m4/poll.m4 +++ b/m4/poll.m4 @@ -1,13 +1,14 @@ -# poll.m4 serial 9 -dnl Copyright (c) 2003, 2005, 2006, 2007, 2009 Free Software Foundation, Inc. +# poll.m4 serial 13 +dnl Copyright (c) 2003, 2005-2007, 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. AC_DEFUN([gl_FUNC_POLL], [ - AC_CHECK_HEADERS([poll.h]) + AC_REQUIRE([gl_POLL_H]) if test "$ac_cv_header_poll_h" = no; then + ac_cv_func_poll=no gl_cv_func_poll=no else AC_CHECK_FUNC([poll], @@ -18,27 +19,30 @@ AC_DEFUN([gl_FUNC_POLL], #include int main() { + int result = 0; struct pollfd ufd; /* Try /dev/null for reading. */ ufd.fd = open ("/dev/null", O_RDONLY); - if (ufd.fd < 0) - /* If /dev/null does not exist, it's not MacOS X nor AIX. */ - return 0; - ufd.events = POLLIN; - ufd.revents = 0; - if (!(poll (&ufd, 1, 0) == 1 && ufd.revents == POLLIN)) - return 1; + /* If /dev/null does not exist, it's not MacOS X nor AIX. */ + if (ufd.fd >= 0) + { + ufd.events = POLLIN; + ufd.revents = 0; + if (!(poll (&ufd, 1, 0) == 1 && ufd.revents == POLLIN)) + result |= 1; + } /* Try /dev/null for writing. */ ufd.fd = open ("/dev/null", O_WRONLY); - if (ufd.fd < 0) - /* If /dev/null does not exist, it's not MacOS X nor AIX. */ - return 0; - ufd.events = POLLOUT; - ufd.revents = 0; - if (!(poll (&ufd, 1, 0) == 1 && ufd.revents == POLLOUT)) - return 1; + /* If /dev/null does not exist, it's not MacOS X nor AIX. */ + if (ufd.fd >= 0) + { + ufd.events = POLLOUT; + ufd.revents = 0; + if (!(poll (&ufd, 1, 0) == 1 && ufd.revents == POLLOUT)) + result |= 2; + } /* Trying /dev/tty may be too environment dependent. */ - return 0; + return result; }]])], [gl_cv_func_poll=yes], [gl_cv_func_poll=no], @@ -50,18 +54,21 @@ This is MacOSX or AIX #endif ], [gl_cv_func_poll=no], [gl_cv_func_poll=yes])])]) fi - if test $gl_cv_func_poll = yes; then - AC_DEFINE([HAVE_POLL], [1], - [Define to 1 if you have the 'poll' function and it works.]) - POLL_H= - else + if test $gl_cv_func_poll != yes; then + AC_CHECK_FUNC([poll], [ac_cv_func_poll=yes], [ac_cv_func_poll=no]) + if test $ac_cv_func_poll = no; then + HAVE_POLL=0 + else + REPLACE_POLL=1 + fi + fi + if test $HAVE_POLL = 0 || test $REPLACE_POLL = 1; then AC_LIBOBJ([poll]) - AC_DEFINE([poll], [rpl_poll], - [Define to poll if the replacement function should be used.]) gl_PREREQ_POLL - POLL_H=poll.h + else + AC_DEFINE([HAVE_POLL], [1], + [Define to 1 if you have the 'poll' function and it works.]) fi - AC_SUBST([POLL_H]) ]) # Prerequisites of lib/poll.c.