[vlc-devel] commit: XCB: configure rules ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Mar  1 21:33:03 2009 +0200| [888c45ec79dd32e04cd8c9c7bb26d9bf333665c4] | committer: Rémi Denis-Courmont 

XCB: configure rules

> http://git.videolan.org/gitweb.cgi/vlc.git/?a=commit;h=888c45ec79dd32e04cd8c9c7bb26d9bf333665c4
---

 configure.ac                    |   23 +++++++++++++++++++++++
 modules/video_output/Modules.am |    8 +-------
 2 files changed, 24 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 7044602..0ccdea7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4122,6 +4122,29 @@ 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)
 dnl
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 5e9e356..70114f7 100644
--- 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