From 50c53e4b24085174fbe8267d4da2b51711543374 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Sat, 28 Mar 2009 21:38:44 +0100
Subject: Makefile.am: use SAMPLERATE_CFLAGS and SAMPLERATE_LIBS

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

diff --git a/Makefile.am b/Makefile.am
index dfbaf37c1..249383150 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -12,6 +12,7 @@ src_mpd_CPPFLAGS = $(AM_CPPFLAGS) \
 	$(INPUT_CFLAGS) \
 	$(DECODER_CFLAGS) \
 	$(ENCODER_CFLAGS) \
+	$(FILTER_CFLAGS) \
 	$(OUTPUT_CFLAGS)
 src_mpd_LDADD = $(MPD_LIBS) \
 	$(SQLITE_LIBS) \
@@ -20,6 +21,7 @@ src_mpd_LDADD = $(MPD_LIBS) \
 	$(DECODER_LIBS) \
 	$(ENCODER_LIBS) \
 	$(OUTPUT_LIBS) \
+	$(FILTER_LIBS) \
 	$(GLIB_LIBS)
 
 mpd_headers = \
@@ -243,6 +245,11 @@ if ENABLE_SQLITE
 src_mpd_SOURCES += src/sticker.c src/song_sticker.c
 endif
 
+FILTER_CFLAGS = \
+	$(SAMPLERATE_CFLAGS)
+FILTER_LIBS = \
+	$(SAMPLERATE_LIBS)
+
 if HAVE_LIBSAMPLERATE
 src_mpd_SOURCES += src/pcm_resample_libsamplerate.c
 endif
diff --git a/configure.ac b/configure.ac
index 6e2cd23fa..76741cac1 100644
--- a/configure.ac
+++ b/configure.ac
@@ -481,10 +481,8 @@ AC_ARG_ENABLE(lsr,
 
 if test x$enable_lsr = xyes; then
 	PKG_CHECK_MODULES([SAMPLERATE], [samplerate >= 0.0.15],
-		[enable_lsr=yes;AC_DEFINE([HAVE_LIBSAMPLERATE], 1,
-		[Define to enable libsamplerate])]
-			MPD_LIBS="$MPD_LIBS $SAMPLERATE_LIBS"
-			MPD_CFLAGS="$MPD_CFLAGS $SAMPLERATE_CFLAGS",
+		[AC_DEFINE([HAVE_LIBSAMPLERATE], 1,
+		[Define to enable libsamplerate])],
 		[enable_lsr=no;AC_MSG_WARN([libsamplerate not found -- disabling])])
 fi
 
-- 
cgit v1.2.3