Makefile.am: use WAVPACK_CFLAGS and WAVPACK_LIBS
Don't append these to MPD_CFLAGS and MPD_LIBS.
This commit is contained in:
parent
d897170455
commit
a620e936cc
@ -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) \
|
||||
|
@ -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
|
||||
|
||||
|
Loading…
x
Reference in New Issue
Block a user