Makefile.am: use SAMPLERATE_CFLAGS and SAMPLERATE_LIBS

Don't add those to MPD_CFLAGS and MPD_LIBS.

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

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