Makefile.am: use PULSE_CFLAGS and PULSE_LIBS

Don't add those to MPD_CFLAGS and MPD_LIBS.

Makefile.am: use PULSE_CFLAGS and PULSE_LIBS
33aeac4f · Max Kellermann · 5164cc1f · 33aeac4f · 33aeac4f
Commit 33aeac4f authored Mar 28, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 4 additions and 4 deletions

Makefile.am Makefile.am +2 -0

configure.ac configure.ac +2 -4

No files found.
--- a/Makefile.am
+++ b/Makefile.am
@@ -449,12 +449,14 @@ OUTPUT_CFLAGS = \
 	$(AO_CFLAGS) \
 	$(ALSA_CFLAGS) \
 	$(JACK_CFLAGS) \
+	$(PULSE_CFLAGS) \
 	$(SHOUT_CFLAGS)

 OUTPUT_LIBS = \
 	$(AO_LIBS) \
 	$(ALSA_LIBS) \
 	$(JACK_LIBS) \
+	$(PULSE_LIBS) \
 	$(SHOUT_LIBS)

 OUTPUT_API_SRC = \

--- a/configure.ac
+++ b/configure.ac
@@ -660,10 +660,8 @@ AM_CONDITIONAL(HAVE_OSS, test x$enable_oss = xyes)

 if test x$enable_pulse = xyes; then
 	PKG_CHECK_MODULES([PULSE], [libpulse-simple],
-		[enable_pulse=yes;AC_DEFINE([HAVE_PULSE], 1, 
-		[Define to enable PulseAudio support])]
-			MPD_LIBS="$MPD_LIBS $PULSE_LIBS"
-			MPD_CFLAGS="$MPD_CFLAGS $PULSE_CFLAGS",
+		[AC_DEFINE([HAVE_PULSE], 1,
+		[Define to enable PulseAudio support])],
 		[enable_pulse=no;AC_MSG_WARN([PulseAudio not found -- disabling])])
 fi