[vlc-commits] commit: pulse: require Xlib ( Rémi Denis-Courmont )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Tue May 25 20:30:24 2010 +0300| [495813af59b07ed7b45347b241ef0ac5fed617ea] | committer: Rémi Denis-Courmont 

pulse: require Xlib

(cherry picked from commit 36c1cbc3f2e228ef120e7413cc2613d3f8aded5c)

Conflicts:

	configure.ac

> http://git.videolan.org/gitweb.cgi/vlc/vlc-1.1.git/?a=commit;h=495813af59b07ed7b45347b241ef0ac5fed617ea
---

 configure.ac                 |   12 +++++++++---
 modules/audio_output/pulse.c |    4 +++-
 2 files changed, 12 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index c41577a..f02a128 100644
--- a/configure.ac
+++ b/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
diff --git a/modules/audio_output/pulse.c b/modules/audio_output/pulse.c
index 852e418..f36ec09 100644
--- a/modules/audio_output/pulse.c
+++ b/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