diff options
| author | Chris Wilson <chris@chris-wilson.co.uk> | 2010-01-25 16:45:03 +0000 |
|---|---|---|
| committer | Chris Wilson <chris@chris-wilson.co.uk> | 2010-01-25 16:45:03 +0000 |
| commit | 123bdb086ad9c5725a51791458d31309c69a3f41 (patch) | |
| tree | c5ed0ea366d91292a9f35f14fcc3a6250eef0d99 /build | |
| parent | e1b3330376c173633e146eb6cf578592d424e4d5 (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 'build')
| -rw-r--r-- | build/Makefile.win32.features | 1 | ||||
| -rw-r--r-- | build/Makefile.win32.features-h | 3 | ||||
| -rw-r--r-- | build/configure.ac.features | 1 |
3 files changed, 5 insertions, 0 deletions
diff --git a/build/Makefile.win32.features b/build/Makefile.win32.features index b8c40a85..66938fc0 100644 --- a/build/Makefile.win32.features +++ b/build/Makefile.win32.features @@ -4,6 +4,7 @@ CAIRO_HAS_XLIB_SURFACE=0 CAIRO_HAS_XLIB_XRENDER_SURFACE=0 CAIRO_HAS_XCB_SURFACE=0 CAIRO_HAS_XLIB_XCB_FUNCTIONS=0 +CAIRO_HAS_XCB_SHM_FUNCTIONS=0 CAIRO_HAS_QT_SURFACE=0 CAIRO_HAS_QUARTZ_SURFACE=0 CAIRO_HAS_QUARTZ_FONT=0 diff --git a/build/Makefile.win32.features-h b/build/Makefile.win32.features-h index 95e9386d..ca21aba2 100644 --- a/build/Makefile.win32.features-h +++ b/build/Makefile.win32.features-h @@ -17,6 +17,9 @@ endif ifeq ($(CAIRO_HAS_XLIB_XCB_FUNCTIONS),1) @echo "#define CAIRO_HAS_XLIB_XCB_FUNCTIONS 1" >> src/cairo-features.h endif +ifeq ($(CAIRO_HAS_XCB_SHM_FUNCTIONS),1) + @echo "#define CAIRO_HAS_XCB_SHM_FUNCTIONS 1" >> src/cairo-features.h +endif ifeq ($(CAIRO_HAS_QT_SURFACE),1) @echo "#define CAIRO_HAS_QT_SURFACE 1" >> src/cairo-features.h endif diff --git a/build/configure.ac.features b/build/configure.ac.features index c55b4efa..8c96ed0a 100644 --- a/build/configure.ac.features +++ b/build/configure.ac.features @@ -395,6 +395,7 @@ AC_DEFUN([CAIRO_REPORT], echo " Eagle functions: $use_eagle" echo " X11-xcb functions: $use_xlib_xcb" echo " XCB-drm functions: $use_xcb_drm" + echo " XCB-shm functions: $use_xcb_shm" echo "" echo "The following features and utilies:" echo " cairo-trace: $use_trace" |