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

configure.ac: substitute MPCDEC_LIBS, MPCDEC_CFLAGS

Browse Source 
Don't use MPD_LIBS, MPC_CFLAGS.
This commit is contained in:
Max Kellermann 2011-10-09 17:58:36 +02:00
parent 389fbaaca2
commit 0c3a7bcf12
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
Makefile.am
View File

@ -406,6 +406,7 @@ endif
# archive plugins # archive plugins
ARCHIVE_CFLAGS = \ ARCHIVE_CFLAGS = \
$(BZ2_CFLAGS) \
$(ISO9660_CFLAGS) \ $(ISO9660_CFLAGS) \
$(ZZIP_CFLAGS) $(ZZIP_CFLAGS)
@ -471,6 +472,7 @@ DECODER_CFLAGS = \
$(MAD_CFLAGS) \ $(MAD_CFLAGS) \
$(MPG123_CFLAGS) \ $(MPG123_CFLAGS) \
$(FFMPEG_CFLAGS) \ $(FFMPEG_CFLAGS) \
$(MPCDEC_CFLAGS) \
$(CUE_CFLAGS) $(CUE_CFLAGS)
DECODER_LIBS = \ DECODER_LIBS = \
@ -487,6 +489,7 @@ DECODER_LIBS = \
$(MPG123_LIBS) \ $(MPG123_LIBS) \
$(MP4FF_LIBS) \ $(MP4FF_LIBS) \
$(FFMPEG_LIBS) \ $(FFMPEG_LIBS) \
$(MPCDEC_LIBS) \
$(CUE_LIBS) $(CUE_LIBS)
DECODER_SRC = \ DECODER_SRC = \

10
configure.ac
View File

@ -912,10 +912,12 @@ if test x$enable_mpc = xyes; then
old_mpcdec=yes, old_mpcdec=yes,
enable_mpc=no)]) enable_mpc=no)])
if test x$enable_mpc = xyes; then if test x$enable_mpc = xyes; then
AC_CHECK_LIB(mpcdec,main, AC_CHECK_LIB(mpcdec,main,,
[MPD_LIBS="$MPD_LIBS $MPCDEC_LIBS"; [],
MPD_CFLAGS="$MPD_CFLAGS $MPCDEC_CFLAGS";],
enable_mpc=no) enable_mpc=no)
else
MPCDEC_LIBS=""
MPCDEC_CFLAGS=""
fi fi
if test x$enable_mpc = xyes; then if test x$enable_mpc = xyes; then
AC_DEFINE(HAVE_MPCDEC,1, AC_DEFINE(HAVE_MPCDEC,1,
@ -932,6 +934,8 @@ if test x$enable_mpc = xyes; then
CPPFLAGS=$oldcppflags CPPFLAGS=$oldcppflags
fi fi
AC_SUBST(MPCDEC_LIBS)
AC_SUBST(MPCDEC_CFLAGS)
AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes) AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes)
dnl -------------------------------- Ogg Tremor ------------------------------- dnl -------------------------------- Ogg Tremor -------------------------------