X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure.ac;h=9503abbcd3f34014623b3d3785f598baaaca2267;hb=a27709775d5ef457a4e3a41b4ec953cf828acabe;hp=01367446902a717bec930966ee46c5876775b1b9;hpb=025e08ce9c5e67bd17ca1aa84b6a9a56e4e31682;p=vlc

diff --git a/configure.ac b/configure.ac
index 0136744690..9503abbcd3 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
@@ -4683,6 +4685,7 @@ AC_CONFIG_FILES([
   projects/activex/Makefile
   projects/activex/axvlc.inf
   doc/Makefile
+  doc/Doxyfile
   extras/package/ipkg/Makefile
   libs/loader/Makefile
   libs/srtp/Makefile