summaryrefslogtreecommitdiff
path: root/dist/libxcb/configure.ac
diff options
context:
space:
mode:
authorMatthieu Herrb <matthieu@cvs.openbsd.org>2009-05-31 16:44:45 +0000
committerMatthieu Herrb <matthieu@cvs.openbsd.org>2009-05-31 16:44:45 +0000
commit10954743c34459bae532d815a69d7bba341545aa (patch)
tree9a918d062c1359f6fc535abcc229ac7f1d2afa86 /dist/libxcb/configure.ac
parentba77e8bba9c3ad84d9a1afab7fac0fe726dfabf7 (diff)
update to libxcb 1.3
Diffstat (limited to 'dist/libxcb/configure.ac')
-rw-r--r--dist/libxcb/configure.ac17
1 files changed, 15 insertions, 2 deletions
diff --git a/dist/libxcb/configure.ac b/dist/libxcb/configure.ac
index 6fe3e57c3..95fa351dd 100644
--- a/dist/libxcb/configure.ac
+++ b/dist/libxcb/configure.ac
@@ -3,7 +3,7 @@
AC_PREREQ(2.57)
AC_INIT([libxcb],
- 1.2,
+ 1.3,
[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,6 +120,15 @@ 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*) ;;
+ *)
+ AC_CHECK_FUNC(poll, [AC_DEFINE(USE_POLL, 1, [poll() function is available])], )
+ ;;
+esac
+
XCB_EXTENSION(Composite, "yes")
XCB_EXTENSION(Damage, "yes")
XCB_EXTENSION(DPMS, "yes")