[vlc-commits] commit: Mozilla plugin requires XCB window plugin which requires xcb-keysyms ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sat May 29 10:23:50 2010 +0300| [1d3a12416c489182c37ca0b09dbb1b3e4b458cb5] | committer: Rémi Denis-Courmont 

Mozilla plugin requires XCB window plugin which requires xcb-keysyms

Otherwise we cannot render videos with X11 (and fallback to
non-embedded SDL or ASCII).
(cherry picked from commit 12e39efb9eef08b7a6d242f076205fe6d5a23469)

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

 configure.ac |    6 ++++++
 1 files changed, 6 insertions(+), 0 deletions(-)

diff --git a/configure.ac b/configure.ac
index 277c1bb..709b375 100644
--- a/configure.ac
+++ b/configure.ac
@@ -4592,6 +4592,9 @@ then
              ],[
                 AC_MSG_ERROR([Please install the libXpm and libXt development files.])
              ])
+             AS_IF([test "${have_xcb_keysyms}" != "yes"], [
+               AC_MSG_ERROR([Please install xcb-keysyms from xcb-utils.])
+             ])
           ])
         ])
         VLC_ADD_CPPFLAGS([mozilla],[${CPPFLAGS} ${XPM_CFLAGS}])
@@ -4621,6 +4624,9 @@ then
          [[${X_LIBS} ${X_PRE_LIBS} -lX11 -lSM -lICE -lXpm]
         ])
         AC_CHECK_HEADERS(X11/xpm.h,,AC_MSG_ERROR([Please install libXpm-devel library for required X11/xpm.h]))
+        AS_IF([test "${have_xcb_keysyms}" != "yes"], [
+          AC_MSG_ERROR([Please install xcb-keysyms from xcb-utils.])
+        ])
         LDFLAGS="${LDFLAGS_save}"
       fi