[vlc-commits] PulseAudio: define HAVE_PULSE

[Rémi Denis-Courmont]

vlc | branch: master | Rémi Denis-Courmont <remi at remlab.net> | Sun May  1 16:29:34 2011 +0300| [5d562483e504d6ff94243442f0ae84c2e99b0d25] | committer: Rémi Denis-Courmont

PulseAudio: define HAVE_PULSE

This will be needed if/when we get a PulseAudio input and SD.

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

 configure.ac                    |   25 +++++++++++++++++++------
 modules/audio_output/Modules.am |    9 ++++++++-
 2 files changed, 27 insertions(+), 7 deletions(-)

diff --git a/configure.ac b/configure.ac
index 49f1c56..a910f1d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3479,12 +3479,20 @@ fi
 dnl
 dnl  Pulseaudio module
 dnl
-PKG_ENABLE_MODULES_VLC([PULSE], [], [libpulse >= 0.9.22], [PulseAudio support], [auto])
-
-dnl
-dnl  Portaudio module
-dnl
-PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto])
+AC_ARG_ENABLE(pulse,
+  [AS_HELP_STRING([--enable-pulse],
+    [use the PulseAudio client library (default auto)])])
+have_pulse="no"
+AS_IF([test "${enable_pulse}" != "no"], [
+  PKG_CHECK_MODULES([PULSE], [libpulse >= 0.9.22], [
+    have_pulse="yes"
+  ], [
+    AS_IF([test "x${enable_pulse}" != "x"], [
+      AC_MSG_ERROR([$PULSE_PKG_ERRORS. PulseAudio 0.9.22 or later required.])
+    ])
+  ])
+])
+AM_CONDITIONAL([HAVE_PULSE], [test "${have_pulse}" = "yes"])
 
 dnl
 dnl  ALSA module
@@ -3504,6 +3512,11 @@ AS_IF([test "${enable_alsa}" != "no"], [
 AM_CONDITIONAL([HAVE_ALSA], [test "${have_alsa}" = "yes"])
 
 dnl
+dnl  Portaudio module
+dnl
+PKG_ENABLE_MODULES_VLC([PORTAUDIO], [], [portaudio-2.0], [Portaudio library support], [auto])
+
+dnl
 dnl  win32 waveOut plugin
 dnl
 AC_ARG_ENABLE(waveout,
diff --git a/modules/audio_output/Modules.am b/modules/audio_output/Modules.am
index eafd24c..9c2804b 100644
--- a/modules/audio_output/Modules.am
+++ b/modules/audio_output/Modules.am
@@ -6,7 +6,6 @@ SOURCES_waveout = waveout.c windows_audio_common.h
 SOURCES_portaudio = portaudio.c
 SOURCES_auhal = auhal.c
 SOURCES_jack = jack.c
-SOURCES_pulse = pulse.c
 SOURCES_audioqueue = audioqueue.c
 
 libvlc_LTLIBRARIES += libaout_file_plugin.la
@@ -18,3 +17,11 @@ libalsa_plugin_la_DEPENDENCIES =
 if HAVE_ALSA
 libvlc_LTLIBRARIES += libalsa_plugin.la
 endif
+
+libpulse_plugin_la_SOURCES = pulse.c
+libpulse_plugin_la_CFLAGS = $(AM_CFLAGS) $(PULSE_CFLAGS)
+libpulse_plugin_la_LIBADD = $(AM_LIBADD) $(PULSE_LIBADD)
+libpulse_plugin_la_DEPENDENCIES =
+if HAVE_PULSE
+libvlc_LTLIBRARIES += libpulse_plugin.la
+endif