summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJeremy Huddleston <jeremyhu@freedesktop.org>2009-12-22 10:58:07 -0800
committerJeremy Huddleston <jeremyhu@freedesktop.org>2009-12-22 10:58:07 -0800
commit5cb2d1e544ee22a29cfbc2c9729e2d043eb916b5 (patch)
tree19d5fe4c584614437d4d5a2402307178aacb0a9b
parent21e3e5b6fe0ed2e17c3fd403433e07350393cd1c (diff)
darwin: Don't use poll()
Signed-off-by: Jeremy Huddleston <jeremyhu@freedesktop.org>
-rw-r--r--configure.ac13
1 files changed, 11 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac
index e27f8fd..54f1f3f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -39,8 +39,8 @@ AC_PROG_INSTALL
AC_CANONICAL_HOST
-AC_CHECK_HEADERS([poll.h pty.h stropts.h sys/param.h sys/select.h])
-AC_CHECK_FUNCS([poll select grantpt])
+AC_CHECK_HEADERS([pty.h stropts.h sys/param.h sys/select.h])
+AC_CHECK_FUNCS([select grantpt])
AC_CHECK_LIB(z, gzopen,, AC_MSG_ERROR([zlib not found]))
@@ -55,10 +55,19 @@ AC_SUBST([LOCALEALIASFILE])
PKG_CHECK_MODULES(LUIT, x11 fontenc)
case $host_os in
+ # darwin has poll() but can't be used to poll character devices (atleast
+ through SnowLeopard)
+ darwin*)
+ OS_CFLAGS=
+ ;;
linux*)
+ AC_CHECK_HEADERS([poll.h])
+ AC_CHECK_FUNCS([poll])
OS_CFLAGS="-D_XOPEN_SOURCE=500"
;;
*)
+ AC_CHECK_HEADERS([poll.h])
+ AC_CHECK_FUNCS([poll])
OS_CFLAGS=
;;
esac