From 33aeac4fcbc1f7a53304d1677b5ac01bb4ce3766 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 28 Mar 2009 21:39:26 +0100
Subject: [PATCH] Makefile.am: use PULSE_CFLAGS and PULSE_LIBS

Don't add those to MPD_CFLAGS and MPD_LIBS.
---
 Makefile.am  | 2 ++
 configure.ac | 6 ++----
 2 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index e20aeea54..34e46a87d 100644
--- 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 = \
diff --git a/configure.ac b/configure.ac
index b1e200ff1..3d6ec62af 100644
--- 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