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

configure.ac: substitute FAAD_CFLAGS, FAAD_LIBS

Browse Source 
Don't use MPC_CFLAGS, MPD_LIBS.
This commit is contained in:
Max Kellermann
2011-10-09 18:25:09 +02:00
parent 0c3a7bcf12
commit cbd6770f2f
2 changed files with 10 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
Makefile.am
View File

@@ -473,6 +473,7 @@ DECODER_CFLAGS = \
$(MPG123_CFLAGS) \ $(MPG123_CFLAGS) \
$(FFMPEG_CFLAGS) \ $(FFMPEG_CFLAGS) \
$(MPCDEC_CFLAGS) \ $(MPCDEC_CFLAGS) \
$(FAAD_CFLAGS) \
$(CUE_CFLAGS) $(CUE_CFLAGS)
DECODER_LIBS = \ DECODER_LIBS = \
@@ -490,6 +491,7 @@ DECODER_LIBS = \
$(MP4FF_LIBS) \ $(MP4FF_LIBS) \
$(FFMPEG_LIBS) \ $(FFMPEG_LIBS) \
$(MPCDEC_LIBS) \ $(MPCDEC_LIBS) \
$(FAAD_LIBS) \
$(CUE_LIBS) $(CUE_LIBS)
DECODER_SRC = \ DECODER_SRC = \

10
m4/faad.m4
View File

@@ -50,10 +50,10 @@ if test x$enable_aac = xyes; then
AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>]) AC_CHECK_DECL(faacDecInit2,,enable_aac=no,[#include <faad.h>])
fi fi
if test x$enable_aac = xyes; then 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 if test x$enable_aac = xno; then
enable_aac=yes 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
fi fi
if test x$enable_aac = xyes; then if test x$enable_aac = xyes; then
@@ -188,5 +188,11 @@ if test x$enable_aac = xyes; then
CPPFLAGS=$oldcppflags CPPFLAGS=$oldcppflags
else else
enable_mp4=no enable_mp4=no
FAAD_CFLAGS=""
FAAD_LIBS=""
fi fi
AC_SUBST(FAAD_CFLAGS)
AC_SUBST(FAAD_LIBS)
]) ])