XCB: configure rules

diff --git a/configure.ac b/configure.ac
index 7044602d42347b9290c743992ff8d223bfdf9559..0ccdea7ce591adf90438e93edf78003ae70ae00f 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -4121,6 +4121,29 @@ dnl End of Xlib tests
 CPPFLAGS="${CPPFLAGS_save}"
 
 
+dnl
+dnl  X C Bindings modules
+dnl  (work in progress)
+dnl
+AC_ARG_ENABLE(xcb,
+  [  --enable-xcb            X C Bindings work-in-progress (default disabled)],
+  ,[enable_xcb="no"])
+AS_IF([test "${enable_xcb}" != "no"], [
+  PKG_CHECK_MODULES(XPROTO, [xproto])
+
+  dnl libxcb
+  PKG_CHECK_MODULES(XCB, [xcb])
+  PKG_CHECK_MODULES(XCB_SHM, [xcb-shm])
+
+  dnl xcb-utils
+  PKG_CHECK_MODULES(XCB_AUX, [xcb-aux])
+  PKG_CHECK_MODULES(XCB_IMAGE, [xcb-image])
+  PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms])
+
+  VLC_ADD_PLUGIN([xcb])
+  VLC_ADD_PLUGIN([xcb_window])
+])
+
 dnl
 dnl  OpenGL module
 dnl  (enabled by default except on beos)

diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 5e9e356ff6b764809dc07366092d7a84212a4860..70114f7602b15593259def5677e26e02866d81ba 100644 (file)
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -20,13 +20,6 @@ SOURCES_directfb = directfb.c
 SOURCES_vmem = vmem.c
 SOURCES_yuv = yuv.c
 
-# TODO: move to configure.ac once/if xcb plugin gets more functional
-XCB_LIBS = -lxcb
-XCB_SHM_LIBS = -lxcb-shm
-XCB_AUX_LIBS = -lxcb-aux
-XCB_IMAGE_LIBS = -lxcb-image
-XCB_KEYSYMS_LIBS = -lxcb-keysyms
-
 libxcb_plugin_la_SOURCES = \
        xcb/xcb_vlc.h \
        xcb/xcb.c \
@@ -51,6 +44,7 @@ libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
 libxcb_window_plugin_la_DEPENDENCIES =
 
 EXTRA_LTLIBRARIES += libxcb_plugin.la libxcb_window_plugin.la
+libvlc_LTLIBRARIES += $(LTLIBxcb) $(LTLIBxcb_window)
 
 # XXX: do we need yet another modules/ subdirectory?
 libdrawable_plugin_la_SOURCES = drawable.c