aboutsummaryrefslogtreecommitdiff
path: root/libxcb/configure.ac
diff options
context:
space:
mode:
authormarha <marha@users.sourceforge.net>2010-05-18 13:54:22 +0000
committermarha <marha@users.sourceforge.net>2010-05-18 13:54:22 +0000
commit96bd0f520fd4a3a8c54e76638985389f60d936e0 (patch)
tree32643acb5ff4fc3b8a35c7842f94dea7d69c2c73 /libxcb/configure.ac
parent4787c5a8db870b0cff2326bd750c4d96c7d84e51 (diff)
parenta457b80612b4f37be47099e9a0f38c4fc2a42252 (diff)
downloadvcxsrv-96bd0f520fd4a3a8c54e76638985389f60d936e0.tar.gz
vcxsrv-96bd0f520fd4a3a8c54e76638985389f60d936e0.tar.bz2
vcxsrv-96bd0f520fd4a3a8c54e76638985389f60d936e0.zip
svn merge "^/branches/released" .
Diffstat (limited to 'libxcb/configure.ac')
-rw-r--r--libxcb/configure.ac7
1 files changed, 3 insertions, 4 deletions
diff --git a/libxcb/configure.ac b/libxcb/configure.ac
index 5fb5c492c..c5f454bee 100644
--- a/libxcb/configure.ac
+++ b/libxcb/configure.ac
@@ -32,7 +32,7 @@ fi
AC_SUBST(HTML_CHECK_RESULT)
# Checks for pkg-config packages
-PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5)
+PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.6)
NEEDED="pthread-stubs xau >= 0.99.2"
PKG_CHECK_MODULES(NEEDED, $NEEDED)
@@ -121,9 +121,8 @@ AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
XCB_CHECK_DOXYGEN()
case $host_os in
- # darwin has poll() but can't be used to poll character devices
- # darwin10 (SnowLeopard) should be tested as well once released
- darwin7*) ;; darwin8*) ;; darwin9*) ;;
+ # darwin has poll() but can't be used to poll character devices (atleast through SnowLeopard)
+ darwin*) ;;
*)
AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
;;