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: use LAME_CFLAGS and LAME_LIBS
b9a5e787 · Max Kellermann · 0a62bdad · b9a5e787 · b9a5e787
Commit b9a5e787 authored Apr 01, 2009 by Max Kellermann
Hide whitespace changes
Inline Side-by-side

Showing with 6 additions and 2 deletions

Makefile.am Makefile.am +2 -0

configure.ac configure.ac +4 -2

No files found.
--- 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 =

--- 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