[vlc-devel] [PATCH 19/23] HACK: fix static linking against XCB

[Rémi Denis-Courmont]

xcb.pc is missing the correct Libs.private entries.
---
 configure.ac                    |    4 ++--
 modules/access/Modules.am       |    2 +-
 modules/video_output/Modules.am |    6 +++---
 3 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index 4bce688..0d549b3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3643,7 +3643,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
 
   PKG_CHECK_MODULES(XCB_RANDR, [xcb-randr >= 1.3], [
     VLC_ADD_PLUGIN([panoramix])
-    VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS}])
+    VLC_ADD_LIBS([panoramix],[${XCB_RANDR_LIBS} ${XCB_LIBS} -lXau lXdmcp])
     VLC_ADD_CFLAGS([panoramix],[${XCB_RANDR_CFLAGS} ${XCB_CFLAGS}])
   ], [true])
 
@@ -3653,7 +3653,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
   VLC_ADD_PLUGIN([xcb_window])
   VLC_ADD_PLUGIN([globalhotkeys])
   VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] )
-  VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] )
+  VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS} -lXau -lXdmcp])
 ])
 
 
diff --git a/modules/access/Modules.am b/modules/access/Modules.am
index e043faf..3228ca1 100644
--- a/modules/access/Modules.am
+++ b/modules/access/Modules.am
@@ -67,7 +67,7 @@ libxcb_screen_plugin_la_SOURCES = screen/xcb.c
 libxcb_screen_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XCB_CFLAGS)
 libxcb_screen_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XCB_LIBS)
+	$(XCB_LIBS) -lXau -lXdmcp
 libxcb_screen_plugin_la_DEPENDENCIES =
 EXTRA_LTLIBRARIES += libxcb_screen_plugin.la
 libvlc_LTLIBRARIES += $(LTLIBxcb_screen)
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 2062ed1..25bb75a 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -31,7 +31,7 @@ libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XPROTO_CFLAGS)
 libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XCB_LIBS) $(XCB_SHM_LIBS) \
-	$(XPROTO_LIBS)
+	$(XPROTO_LIBS) -lXau -lXdmcp
 libxcb_x11_plugin_la_DEPENDENCIES =
 
 libxcb_xv_plugin_la_SOURCES = \
@@ -44,7 +44,7 @@ libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XPROTO_CFLAGS)
 libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
 	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS) \
-	$(XPROTO_LIBS)
+	$(XPROTO_LIBS) -lXau -lXdmcp
 libxcb_xv_plugin_la_DEPENDENCIES =
 
 libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
@@ -54,7 +54,7 @@ libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
 	$(XCB_KEYSYMS_CFLAGS)
 libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
 	-losso \
-	$(XCB_LIBS) \
+	$(XCB_LIBS) -lXau -lXdmcp \
 	$(XCB_KEYSYMS_LIBS)
 libxcb_window_plugin_la_DEPENDENCIES =
 
-- 
1.6.4.3