oysteikt
/
mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

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.
This commit is contained in:
Max Kellermann 2009-04-01 22:05:53 +02:00
parent 0a62bdaded
commit b9a5e78780
2 changed files with 6 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@ -390,9 +390,11 @@ endif
# encoder plugins # encoder plugins
ENCODER_CFLAGS = \ ENCODER_CFLAGS = \
$(LAME_CFLAGS) \
$(VORBISENC_CFLAGS) $(VORBISENC_CFLAGS)
ENCODER_LIBS = \ ENCODER_LIBS = \
$(LAME_LIBS) \
$(VORBISENC_LIBS) $(VORBISENC_LIBS)
ENCODER_SRC = ENCODER_SRC =

6
configure.ac
View File

@ -957,12 +957,14 @@ MPD_AUTO_PKG(oggvorbis_encoder, VORBISENC, [vorbisenc],
[Ogg Vorbis encoder], [libvorbisenc not found]) [Ogg Vorbis encoder], [libvorbisenc not found])
if test x$enable_lame = xyes; then if test x$enable_lame = xyes; then
AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS" AM_PATH_LAME(,
MPD_CFLAGS="$MPD_CFLAGS $LAME_CFLAGS"],
[enable_lame=no; [enable_lame=no;
AC_MSG_WARN(You need lame -- disabling lame support)]) AC_MSG_WARN(You need lame -- disabling lame support)])
fi fi
AC_SUBST(LAME_CFLAGS)
AC_SUBST(LAME_LIBS)
if test x$enable_oggvorbis_encoder != xno || test x$enable_lame != xno; then if test x$enable_oggvorbis_encoder != xno || test x$enable_lame != xno; then
# at least one encoder plugin is enabled # at least one encoder plugin is enabled
enable_encoder=yes enable_encoder=yes