pulse: require Xlib

(cherry picked from commit 36c1cbc3)

Conflicts:

	configure.ac

configure.ac

@@ -3752,10 +3752,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])
+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

modules/audio_output/pulse.c

@@ -121,7 +121,9 @@ static int Open ( vlc_object_t *p_this )
     struct pa_buffer_attr a;
     struct pa_channel_map map;
 
-#ifdef HAVE_X11_XLIB_H
+#ifdef X_DISPLAY_MISSING
+# error Xlib required due to PulseAudio bug 799!
+#else
     if( !XInitThreads() )
         return VLC_EGENERIC;
 #endif