X-Git-Url: http://git.demorecorder.com/cgi-bin/gitweb.cgi?a=blobdiff_plain;f=configure.ac;h=96f507903806cd56b8fbe67c7851357824f5491e;hb=a27c77ccae059fb64e0506648b81677858d3b05b;hp=46c4611ec7c6dcd77e5e6d2ff5d7850f7c38d787;hpb=f916062edf0e04cd4e0a78f6975892f59fae3b60;p=free-sw%2Fxcb%2Flibxcb

diff --git a/configure.ac b/configure.ac
index 46c4611..96f5079 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3,7 +3,7 @@
 
 AC_PREREQ(2.57)
 AC_INIT([libxcb],
-        1.2,
+        1.4,
         [xcb@lists.freedesktop.org])
 AC_CONFIG_SRCDIR([xcb.pc.in])
 AM_INIT_AUTOMAKE([foreign dist-bzip2])
@@ -32,7 +32,7 @@ fi
 AC_SUBST(HTML_CHECK_RESULT)
 
 # Checks for pkg-config packages
-PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.1)
+PKG_CHECK_MODULES(XCBPROTO, xcb-proto >= 1.5)
 NEEDED="pthread-stubs xau >= 0.99.2"
 PKG_CHECK_MODULES(NEEDED, $NEEDED)
 
@@ -58,6 +58,10 @@ XCBPROTO_XCBINCLUDEDIR=`$PKG_CONFIG --variable=xcbincludedir xcb-proto`
 AC_MSG_RESULT($XCBPROTO_XCBINCLUDEDIR)
 AC_SUBST(XCBPROTO_XCBINCLUDEDIR)
 
+# Find the xcb-proto version
+XCBPROTO_VERSION=`$PKG_CONFIG --modversion xcb-proto`
+AC_SUBST(XCBPROTO_VERSION)
+
 # Find the xcbgen Python package
 AC_MSG_CHECKING(XCBPROTO_XCBPYTHONDIR)
 XCBPROTO_XCBPYTHONDIR=`$PKG_CONFIG --variable=pythondir xcb-proto`
@@ -116,7 +120,14 @@ AC_PREREQ([2.59c], [], [AC_SUBST([htmldir], [m4_ifset([AC_PACKAGE_TARNAME],
 
 XCB_CHECK_DOXYGEN()
 
-AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+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*) ;;
+	*)
+		AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+	;;
+esac
 
 XCB_EXTENSION(Composite, "yes")
 XCB_EXTENSION(Damage, "yes")