diff options
| author | Christian Linhart <chris@demorecorder.com> | 2017-01-20 20:14:57 +0100 |
|---|---|---|
| committer | Christian Linhart <chris@demorecorder.com> | 2017-03-11 10:51:33 +0100 |
| commit | 0c2c5d50f8670da3e7601feb6a29b53509513da5 (patch) | |
| tree | 357b6f56f930a069dcaf4729291977920c09a634 | |
| parent | 9bce1f72e329cb407b7a95589b9675a08129b65d (diff) | |
optionally build the GE extension
xcb contains an xml-definition for the GenericEvent extension
but this extension was neither generated nor built.
This patch enables optional building of the GenericEvent extension
with configure option --enable-ge
By default, the GenericEvent extension is not built.
Normally this is not needed by application programs
because there is implicit support for the GE-extension
for the specific events built with this extension.
But it may be useful for X-protocol analyzers and stuff like that.
Signed-off-by: Christian Linhart <chris@demorecorder.com>
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 3 | ||||
| -rw-r--r-- | src/Makefile.am | 7 | ||||
| -rw-r--r-- | xcb-ge.pc.in | 11 |
4 files changed, 24 insertions, 0 deletions
diff --git a/Makefile.am b/Makefile.am index 2475b6e..57c3a7b 100644 --- a/Makefile.am +++ b/Makefile.am @@ -84,6 +84,9 @@ endif if BUILD_XVMC pkgconfig_DATA += xcb-xvmc.pc endif +if BUILD_GE +pkgconfig_DATA += xcb-ge.pc +endif AM_TESTS_ENVIRONMENT = \ diff --git a/configure.ac b/configure.ac index ec31542..d3165c6 100644 --- a/configure.ac +++ b/configure.ac @@ -220,6 +220,7 @@ XCB_EXTENSION(Damage, yes) XCB_EXTENSION(DPMS, yes) XCB_EXTENSION(DRI2, yes) XCB_EXTENSION(DRI3, $have_sendmsg) +XCB_EXTENSION(GE, no) XCB_EXTENSION(GLX, yes) XCB_EXTENSION(Present, yes) XCB_EXTENSION(RandR, yes) @@ -271,6 +272,7 @@ xcb-damage.pc xcb-dpms.pc xcb-dri2.pc xcb-dri3.pc +xcb-ge.pc xcb-glx.pc xcb-present.pc xcb-randr.pc @@ -318,6 +320,7 @@ echo " Damage..............: ${BUILD_DAMAGE}" echo " Dpms................: ${BUILD_DPMS}" echo " Dri2................: ${BUILD_DRI2}" echo " Dri3................: ${BUILD_DRI3}" +echo " GenericEvent........: ${BUILD_GE}" echo " Glx.................: ${BUILD_GLX}" echo " Randr...............: ${BUILD_RANDR}" echo " Record..............: ${BUILD_RECORD}" diff --git a/src/Makefile.am b/src/Makefile.am index e06e70b..17b64a8 100644 --- a/src/Makefile.am +++ b/src/Makefile.am @@ -232,6 +232,13 @@ libxcb_xvmc_la_LIBADD = $(XCB_LIBS) nodist_libxcb_xvmc_la_SOURCES = xvmc.c xvmc.h endif +EXTSOURCES += ge.c +if BUILD_GE +lib_LTLIBRARIES += libxcb-ge.la +libxcb_ge_la_LDFLAGS = -version-info 0:0:0 -no-undefined @lt_enable_auto_import@ +libxcb_ge_la_LIBADD = $(XCB_LIBS) +nodist_libxcb_ge_la_SOURCES = ge.c ge.h +endif EXTHEADERS=$(EXTSOURCES:.c=.h) xcbinclude_HEADERS = xcb.h xcbext.h diff --git a/xcb-ge.pc.in b/xcb-ge.pc.in new file mode 100644 index 0000000..b5f380d --- /dev/null +++ b/xcb-ge.pc.in @@ -0,0 +1,11 @@ +prefix=@prefix@ +exec_prefix=@exec_prefix@ +libdir=@libdir@ +includedir=@includedir@ + +Name: XCB GenericEvent +Description: XCB GenericEvent Extension +Version: @PACKAGE_VERSION@ +Requires.private: xcb +Libs: -L${libdir} -lxcb-ge +Cflags: -I${includedir} |