diff options
| author | Max Kellermann <max@duempel.org> | 2009-07-14 21:29:01 +0200 |
|---|---|---|
| committer | Max Kellermann <max@duempel.org> | 2009-07-14 21:29:01 +0200 |
| commit | a620e936cc92440c4cf0a0fada700fe801b6c1a1 (patch) | |
| tree | a16f1adbdbf3188469fe8b78436d55dce2fa2e59 | |
| parent | d897170455c2542940ea7144c5a0bed4578fbe1e (diff) | |
| download | mpd-a620e936cc92440c4cf0a0fada700fe801b6c1a1.tar.gz mpd-a620e936cc92440c4cf0a0fada700fe801b6c1a1.tar.xz mpd-a620e936cc92440c4cf0a0fada700fe801b6c1a1.zip | |
Makefile.am: use WAVPACK_CFLAGS and WAVPACK_LIBS
Don't append these to MPD_CFLAGS and MPD_LIBS.
| -rw-r--r-- | Makefile.am | 2 | ||||
| -rw-r--r-- | configure.ac | 7 |
2 files changed, 4 insertions, 5 deletions
diff --git a/Makefile.am b/Makefile.am index 37d5b3a62..7b16b1116 100644 --- a/Makefile.am +++ b/Makefile.am @@ -332,6 +332,7 @@ DECODER_CFLAGS = \ $(SIDPLAY_CFLAGS) \ $(FLUIDSYNTH_CFLAGS) \ $(WILDMIDI_CFLAGS) \ + $(WAVPACK_CFLAGS) \ $(MAD_CFLAGS) \ $(FFMPEG_CFLAGS) \ $(CUE_CFLAGS) @@ -345,6 +346,7 @@ DECODER_LIBS = \ $(SIDPLAY_LIBS) \ $(FLUIDSYNTH_LIBS) \ $(WILDMIDI_LIBS) \ + $(WAVPACK_LIBS) \ $(MAD_LIBS) \ $(MP4FF_LIBS) \ $(FFMPEG_LIBS) \ diff --git a/configure.ac b/configure.ac index 667f53b5d..81ff2f257 100644 --- a/configure.ac +++ b/configure.ac @@ -829,11 +829,8 @@ AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes) if test x$enable_wavpack = xyes; then PKG_CHECK_MODULES([WAVPACK], [wavpack], - [enable_wavpack=yes; - AC_DEFINE([HAVE_WAVPACK], 1, - [Define to enable WavPack support])] - MPD_LIBS="$MPD_LIBS $WAVPACK_LIBS" - MPD_CFLAGS="$MPD_CFLAGS $WAVPACK_CFLAGS", + [AC_DEFINE([HAVE_WAVPACK], 1, + [Define to enable WavPack support])], enable_wavpack=no) fi |