[vlc-devel] commit: XCB: use xproto for xcb_window, not xcb_x11 and xcb_xv ( Rémi Denis-Courmont )

[git version control]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Thu Oct 29 20:47:41 2009 +0200| [baa9c56c1e60522ba92acdfd0d8a3945daf6cf1f] | committer: Rémi Denis-Courmont 

XCB: use xproto for xcb_window, not xcb_x11 and xcb_xv

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

 configure.ac                    |    3 +--
 modules/video_output/Modules.am |   14 ++++++--------
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/configure.ac b/configure.ac
index d3b9c8b..c92bb7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3650,8 +3650,6 @@ AC_ARG_ENABLE(xvideo,
 
 need_xid_provider="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])
@@ -3690,6 +3688,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
   ])
 
   AS_IF([test "${have_xcb_keysyms}" = "yes"], [
+    PKG_CHECK_MODULES(XPROTO, [xproto])
     VLC_ADD_PLUGIN([xcb_window])
     VLC_ADD_PLUGIN([globalhotkeys])
     VLC_ADD_CFLAGS([globalhotkeys], [${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}])
diff --git a/modules/video_output/Modules.am b/modules/video_output/Modules.am
index 29a4849..34635d6 100644
--- a/modules/video_output/Modules.am
+++ b/modules/video_output/Modules.am
@@ -27,11 +27,9 @@ libxcb_x11_plugin_la_SOURCES = \
 	xcb/common.c \
 	xcb/events.c
 libxcb_x11_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) \
-	$(XPROTO_CFLAGS)
+	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS)
 libxcb_x11_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XCB_LIBS) $(XCB_SHM_LIBS) \
-	$(XPROTO_LIBS)
+	$(XCB_LIBS) $(XCB_SHM_LIBS)
 libxcb_x11_plugin_la_DEPENDENCIES =
 
 libxcb_xv_plugin_la_SOURCES = \
@@ -40,18 +38,18 @@ libxcb_xv_plugin_la_SOURCES = \
 	xcb/common.c \
 	xcb/events.c
 libxcb_xv_plugin_la_CFLAGS = $(AM_CFLAGS) \
-	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS) \
-	$(XPROTO_CFLAGS)
+	$(XCB_CFLAGS) $(XCB_SHM_CFLAGS) $(XCB_XV_CFLAGS)
 libxcb_xv_plugin_la_LIBADD = $(AM_LIBADD) \
-	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS) \
-	$(XPROTO_LIBS)
+	$(XCB_LIBS) $(XCB_SHM_LIBS) $(XCB_XV_LIBS)
 libxcb_xv_plugin_la_DEPENDENCIES =
 
 libxcb_window_plugin_la_SOURCES = xcb/window.c xcb/keys.c
 libxcb_window_plugin_la_CFLAGS = $(AM_CFLAGS) \
+	$(XPROTO_CFLAGS) \
 	$(XCB_CFLAGS) \
 	$(XCB_KEYSYMS_CFLAGS)
 libxcb_window_plugin_la_LIBADD = $(AM_LIBADD) \
+	$(XPROTO_LIBS) \
 	$(XCB_LIBS) \
 	$(XCB_KEYSYMS_LIBS)
 libxcb_window_plugin_la_DEPENDENCIES =