[vlc-commits] commit: Fix xcb-keysyms version checks ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.0 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun Apr 25 12:40:31 2010 +0300| [a966b48cf1e27f70344d8b9c3b91fa8f1412aa31] | committer: Rémi Denis-Courmont 

Fix xcb-keysyms version checks

The (then) work-in-progress XCB window plugin needs the "new" version.
On the other hand, global hotkeys support both xcb-keysyms API.

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

 configure.ac |   31 +++++++++++++++++++------------
 1 files changed, 19 insertions(+), 12 deletions(-)

diff --git a/configure.ac b/configure.ac
index 37c798c..e0ba529 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4205,11 +4205,7 @@ AS_IF([test "${enable_xcb}" != "no"], [
   ])
 
   dnl xcb-utils
-  PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4],
-    [true],
-    [PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms])
-    VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API])]
-  )
+  PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4])
 
   VLC_ADD_PLUGIN([xcb])
   VLC_ADD_PLUGIN([xcb_window])
@@ -5401,14 +5397,25 @@ dnl
 dnl Global hotkeys using XCB
 dnl
 PKG_CHECK_MODULES(XCB, [xcb], [
-  PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [
-    PKG_CHECK_MODULES(XPROTO, [xproto], [
+  PKG_CHECK_MODULES(XPROTO, [xproto], [
+    PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms >= 0.3.4], [
       VLC_ADD_PLUGIN([globalhotkeys])
-      VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] )
-      VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] )
-    ], [ AC_MSG_WARN( [Xproto not found] ) ])
-  ], [ AC_MSG_WARN( [XCB keysyms was not found]) ])
-], [ AC_MSG_WARN( [XCB was not found]) ])
+    ], [
+      PKG_CHECK_MODULES(XCB_KEYSYMS, [xcb-keysyms], [
+        VLC_ADD_PLUGIN([globalhotkeys])
+        VLC_ADD_CFLAGS([globalhotkeys], [-DXCB_KEYSYM_OLD_API])
+      ], [
+        AC_MSG_WARN([libxcb-keysyms not found])
+      ])
+    ])
+    VLC_ADD_CFLAGS([globalhotkeys],[${XCB_KEYSYMS_CFLAGS} ${XCB_CFLAGS}] )
+    VLC_ADD_LIBS([globalhotkeys],[${XCB_KEYSYMS_LIBS} ${XCB_LIBS}] )
+  ], [
+    AC_MSG_WARN([X11 protocol headers (xproto) not found])
+  ])
+], [
+  AC_MSG_WARN([libxcb not found])
+])
 
 AC_ARG_WITH(,[Misc options:])