diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-09 18:25:09 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-09 18:25:09 +0200 |
| commit | cbd6770f2fedb0988f28e951994b50b65b4c0221 (patch) | |
| tree | b993867264de0e0b230885d97bd242095f13e350 | |
| parent | 0c3a7bcf12542389adc404b591d685a5a990af49 (diff) | |
| download | mpd-cbd6770f2fedb0988f28e951994b50b65b4c0221.tar.gz mpd-cbd6770f2fedb0988f28e951994b50b65b4c0221.tar.xz mpd-cbd6770f2fedb0988f28e951994b50b65b4c0221.zip | |
configure.ac: substitute FAAD_CFLAGS, FAAD_LIBS
Don't use MPC_CFLAGS, MPD_LIBS.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | m4/faad.m4 | 10 |
2 files changed, 10 insertions, 2 deletions
diff --git a/Makefile.am b/Makefile.am index ec1b53be6..f02479881 100644 --- a/Makefile.am +++ b/Makefile.am @@ -473,6 +473,7 @@ DECODER_CFLAGS = \ $(MPG123_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(MPCDEC_CFLAGS) \ + $(FAAD_CFLAGS) \ $(CUE_CFLAGS) DECODER_LIBS = \ @@ -490,6 +491,7 @@ DECODER_LIBS = \ $(MP4FF_LIBS) \ $(FFMPEG_LIBS) \ $(MPCDEC_LIBS) \ + $(FAAD_LIBS) \ $(CUE_LIBS) DECODER_SRC = \ diff --git a/m4/faad.m4 b/m4/faad.m4 index 007787557..8576b7d30 100644 --- a/m4/faad.m4 +++ b/m4/faad.m4 @@ -50,10 +50,10 @@ if test x$enable_aac = xyes; then AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>]) fi if test x$enable_aac = xyes; then - AC_CHECK_LIB(faad,faacDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no) + AC_CHECK_LIB(faad,faacDecInit2,,enable_aac=no) if test x$enable_aac = xno; then enable_aac=yes - AC_CHECK_LIB(faad,NeAACDecInit2,[MPD_LIBS="$MPD_LIBS $FAAD_LIBS";MPD_CFLAGS="$MPD_CFLAGS $FAAD_CFLAGS"],enable_aac=no) + AC_CHECK_LIB(faad,NeAACDecInit2,,enable_aac=no) fi fi if test x$enable_aac = xyes; then @@ -188,5 +188,11 @@ if test x$enable_aac = xyes; then CPPFLAGS=$oldcppflags else enable_mp4=no + FAAD_CFLAGS="" + FAAD_LIBS="" fi + +AC_SUBST(FAAD_CFLAGS) +AC_SUBST(FAAD_LIBS) + ]) |