contribs: update gettext to 0.18

[vlc] / configure.ac

diff --git a/configure.ac b/configure.ac
index afc210765e64bcd1ac7ce56c2b817b813694cc13..8556d25a6bc14ebb109c73951811ba6ef54c028d 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -3395,9 +3395,9 @@ then
           ])
       ])
    ],[
-     AC_MSG_ERROR([The development package for SDL is not present or too old.
-                   You need 1.2.10. Alternatively you can also configure with
-                   --disable-sdl.])
+     AC_MSG_WARN([The development package for SDL is not present or too old.
+                  You need 1.2.10. Alternatively you can also configure with
+                  --disable-sdl.])
    ])
 fi
 
@@ -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