[vlc-commits] commit: Linking to X11 is optional (Christophe Mutricy )

[git at videolan.org]

vlc/vlc-1.1 | branch: master | Christophe Mutricy <xtophe at videolan.org> | Fri May 21 23:33:05 2010 +0100| [a912bb91806deb548cb037fa17b918739a46ed17] | committer: Jean-Baptiste Kempf 

Linking to X11 is optional

But you need careful, if you compile without X and then run with an X-enabled PulseAudio, boom.

Closes: #3650
(cherry picked from commit d00684982028100b9caee5b9fe03f007b10f8059)

Signed-off-by: Jean-Baptiste Kempf <jb at videolan.org>

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

 configure.ac |    5 +++--
 1 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/configure.ac b/configure.ac
index 0c93203..2924f5c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3769,8 +3769,9 @@ dnl
 dnl  Pulseaudio module
 dnl
 PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.11], [Pulseaudio support], [auto])
-VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
-
+AS_IF([ test "$have_x" = yes],[
+       VLC_ADD_LIBS([pulse], [${X_LIBS} ${X_PRE_LIBS} -lX11])
+])
 dnl
 dnl  Portaudio module
 dnl