qt4: don't scale to 720p on webm profile

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index 01367446902a717bec930966ee46c5876775b1b9..ed368dd5e57185b61cae69749b239f9d7bf22ecf 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
@@ -3644,14 +3644,16 @@ fi
 dnl
 dnl  Pulseaudio module
 dnl
-PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
-AS_IF([ test "$have_x" = yes],[
-       VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
-     ],[
-        AC_MSG_WARN([The pulse audio output module will be built without X 
-                    support. If you use VLC under X, you will experience 
-                    strange threading problems])
+AS_IF([test "${no_x}" = "yes"], [
+  AS_IF([test "${enable_pulse}" = "yes"], [
+    AC_MSG_ERROR([Xlib is required for VLC PulseAudio support
+(see http://www.pulseaudio.org/ticket/799 for further reference).])
+  ])
+], [
+  PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
+  VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
 ])
+
 dnl
 dnl  Portaudio module
 dnl
@@ -4480,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}])
@@ -4509,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