From b9a5e787807e85898e9b9d13d41e0a1f0230c359 Mon Sep 17 00:00:00 2001
From: Max Kellermann <max@duempel.org>
Date: Wed, 1 Apr 2009 22:05:53 +0200
Subject: Makefile.am: use LAME_CFLAGS and LAME_LIBS

Don't append LAME_CFLAGS/LAME_LIBS to MPD_CFLAGS/MPD_LIBS in
configure.ac.  Export them via AC_SUBST() instead.
---
 Makefile.am  | 2 ++
 configure.ac | 6 ++++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/Makefile.am b/Makefile.am
index f94c4a21f..409cc90ac 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -390,9 +390,11 @@ endif
 # encoder plugins
 
 ENCODER_CFLAGS = \
+	$(LAME_CFLAGS) \
 	$(VORBISENC_CFLAGS)
 
 ENCODER_LIBS = \
+	$(LAME_LIBS) \
 	$(VORBISENC_LIBS)
 
 ENCODER_SRC =
diff --git a/configure.ac b/configure.ac
index 45ce77cdf..b6a687664 100644
--- a/configure.ac
+++ b/configure.ac
@@ -957,12 +957,14 @@ MPD_AUTO_PKG(oggvorbis_encoder, VORBISENC, [vorbisenc],
 	[Ogg Vorbis encoder], [libvorbisenc not found])
 
 if test x$enable_lame = xyes; then
-	AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS"
-		MPD_CFLAGS="$MPD_CFLAGS $LAME_CFLAGS"],
+	AM_PATH_LAME(,
 		[enable_lame=no;
 			AC_MSG_WARN(You need lame -- disabling lame support)])
 fi
 
+AC_SUBST(LAME_CFLAGS)
+AC_SUBST(LAME_LIBS)
+
 if test x$enable_oggvorbis_encoder != xno || test x$enable_lame != xno; then
 	# at least one encoder plugin is enabled
 	enable_encoder=yes
-- 
cgit v1.2.3