diff options
| author | Max Kellermann <max@duempel.org> | 2011-10-09 17:58:36 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2011-10-09 17:58:36 +0200 |
| commit | 0c3a7bcf12542389adc404b591d685a5a990af49 (patch) | |
| tree | 874f6fa329edbff6fdad069fcdc4a2e1ba19cd81 | |
| parent | 389fbaaca2964c2f2c5be6b57c73bb20005e3019 (diff) | |
| download | mpd-0c3a7bcf12542389adc404b591d685a5a990af49.tar.gz mpd-0c3a7bcf12542389adc404b591d685a5a990af49.tar.xz mpd-0c3a7bcf12542389adc404b591d685a5a990af49.zip | |
configure.ac: substitute MPCDEC_LIBS, MPCDEC_CFLAGS
Don't use MPD_LIBS, MPC_CFLAGS.
| -rw-r--r-- | Makefile.am | 3 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 10 insertions, 3 deletions
diff --git a/Makefile.am b/Makefile.am index 43b0964da..ec1b53be6 100644 --- a/Makefile.am +++ b/Makefile.am @@ -406,6 +406,7 @@ endif # archive plugins ARCHIVE_CFLAGS = \ + $(BZ2_CFLAGS) \ $(ISO9660_CFLAGS) \ $(ZZIP_CFLAGS) @@ -471,6 +472,7 @@ DECODER_CFLAGS = \ $(MAD_CFLAGS) \ $(MPG123_CFLAGS) \ $(FFMPEG_CFLAGS) \ + $(MPCDEC_CFLAGS) \ $(CUE_CFLAGS) DECODER_LIBS = \ @@ -487,6 +489,7 @@ DECODER_LIBS = \ $(MPG123_LIBS) \ $(MP4FF_LIBS) \ $(FFMPEG_LIBS) \ + $(MPCDEC_LIBS) \ $(CUE_LIBS) DECODER_SRC = \ diff --git a/configure.ac b/configure.ac index 28dcf7ba7..9c66bcb03 100644 --- a/configure.ac +++ b/configure.ac @@ -912,10 +912,12 @@ if test x$enable_mpc = xyes; then old_mpcdec=yes, enable_mpc=no)]) if test x$enable_mpc = xyes; then - AC_CHECK_LIB(mpcdec,main, - [MPD_LIBS="$MPD_LIBS $MPCDEC_LIBS"; - MPD_CFLAGS="$MPD_CFLAGS $MPCDEC_CFLAGS";], + AC_CHECK_LIB(mpcdec,main,, + [], enable_mpc=no) + else + MPCDEC_LIBS="" + MPCDEC_CFLAGS="" fi if test x$enable_mpc = xyes; then AC_DEFINE(HAVE_MPCDEC,1, @@ -932,6 +934,8 @@ if test x$enable_mpc = xyes; then CPPFLAGS=$oldcppflags fi +AC_SUBST(MPCDEC_LIBS) +AC_SUBST(MPCDEC_CFLAGS) AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes) dnl -------------------------------- Ogg Tremor ------------------------------- |