Fixed mouse buttons state for msw vouts (close #3519).

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 9503abbcd3f34014623b3d3785f598baaaca2267..bc74f621f2be2b279f134a11bf5096fd8cdfcd3b 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1541,13 +1541,13 @@ AS_IF([test "x${enable_debug}" = "xno"], [
 ])
 
 dnl
-dnl Allow runing as root (usefull for people runing on embedded platforms)
+dnl Allow running as root (useful for people running on embedded platforms)
 dnl
 AC_ARG_ENABLE(run-as-root,
-[  --enable-run-as-root    allow runing VLC as root (default disabled)])
+[  --enable-run-as-root    allow running VLC as root (default disabled)])
 AS_IF([test "${enable_run_as_root}" = "yes"],[
     AC_DEFINE(ALLOW_RUN_AS_ROOT, 1,
-              [Define to 1 to allow runing VLC as root (uid 0).])
+              [Define to 1 to allow running VLC as root (uid 0).])
 ])
 
 dnl
@@ -1612,7 +1612,7 @@ then
       AC_MSG_ERROR([Could not find lua. Lua is needed for some interfaces (rc, telnet, http) as well as many other custom scripts. Use --disable-lua to ignore this error.])
   fi
   AC_ARG_VAR([LUAC], [LUA byte compiler])
-  AC_PATH_PROG(LUAC, luac, [false])
+  AC_PATH_PROGS(LUAC,[${LUAC} luac], [false])
   AS_IF([test "${ac_cv_path_LUAC}" = "false"], [
     AC_MSG_ERROR([Could not find the LUA byte compiler.])
   ])
@@ -4312,7 +4312,7 @@ AC_SUBST(DEFS_BIGENDIAN)
 dnl
 dnl Where to install KDE solid .desktop
 dnl
-AC_ARG_VAR([KDE4_CONFIG], [path to kde4-config utility])
+AC_ARG_VAR([KDE4_CONFIG], [kde4-config utility])
 AS_IF([test "x$KDE4_CONFIG" = "x"], [
   KDE4_CONFIG="kde4-config"
 ])
@@ -4482,6 +4482,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}])
@@ -4511,6 +4514,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
 
@@ -4685,7 +4691,6 @@ AC_CONFIG_FILES([
   projects/activex/Makefile
   projects/activex/axvlc.inf
   doc/Makefile
-  doc/Doxyfile
   extras/package/ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile