summaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorChris Wilson <chris@chris-wilson.co.uk>2010-01-25 16:45:03 +0000
committerChris Wilson <chris@chris-wilson.co.uk>2010-01-25 16:45:03 +0000
commit123bdb086ad9c5725a51791458d31309c69a3f41 (patch)
treec5ed0ea366d91292a9f35f14fcc3a6250eef0d99 /configure.ac
parente1b3330376c173633e146eb6cf578592d424e4d5 (diff)
xcb: Make shm optional
Trying to build xcb on a system without SHM wrapped by xcb. The right answer would be to build libxcb-shm. The quick answer is to compile out shm support.
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac14
1 files changed, 13 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index 30d3e98c7..b4f5aa7dd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -109,7 +109,7 @@ CAIRO_ENABLE_SURFACE_BACKEND(xlib_xrender, Xlib Xrender, auto, [
dnl ===========================================================================
CAIRO_ENABLE_SURFACE_BACKEND(xcb, XCB, no, [
- xcb_REQUIRES="xcb >= 0.9.92 xcb-render >= 0.9.92 xcb-shm"
+ xcb_REQUIRES="xcb >= 0.9.92 xcb-render >= 0.9.92"
PKG_CHECK_MODULES(xcb, $xcb_REQUIRES, ,
[AC_MSG_RESULT(no)
use_xcb="no (requires $xcb_REQUIRES http://xcb.freedesktop.org)"])
@@ -126,6 +126,18 @@ CAIRO_ENABLE_FUNCTIONS(xlib_xcb, Xlib/XCB, no, [
])
AM_CONDITIONAL(BUILD_XLIB_XCB, test "x$use_xlib_xcb" = "xyes")
+CAIRO_ENABLE_FUNCTIONS(xcb_shm, XCB/SHM, auto, [
+ if test "x$use_xcb" == "xyes"; then
+ xcb_shm_REQUIRES="xcb-shm"
+ PKG_CHECK_MODULES(xcb_shm, $xcb_shm_REQUIRES, ,
+ [AC_MSG_RESULT(no)
+ use_xcb_shm="no (requires $xcb_shm http://xcb.freedesktop.org)"])
+ else
+ use_xcb_drm="no (requires both --enable-xcb)"
+ fi
+])
+AM_CONDITIONAL(BUILD_XCB_SHM, test "x$use_xcb_shm" = "xyes")
+
dnl ===========================================================================
CAIRO_ENABLE_SURFACE_BACKEND(qt, Qt, no, [