Skip to content

M
mpd
Commit a620e936 authored by Max Kellermann's avatar Max Kellermann
Browse files
Options

Makefile.am: use WAVPACK_CFLAGS and WAVPACK_LIBS

Don't append these to MPD_CFLAGS and MPD_LIBS.
parent d8971704
Hide whitespace changes
Inline Side-by-side
Showing with 4 additions and 5 deletions
Makefile.am
View file @ a620e936
...@@ -332,6 +332,7 @@ DECODER_CFLAGS = \ ...@@ -332,6 +332,7 @@ DECODER_CFLAGS = \
$(SIDPLAY_CFLAGS) \ $(SIDPLAY_CFLAGS) \
$(FLUIDSYNTH_CFLAGS) \ $(FLUIDSYNTH_CFLAGS) \
$(WILDMIDI_CFLAGS) \ $(WILDMIDI_CFLAGS) \
$(WAVPACK_CFLAGS) \
$(MAD_CFLAGS) \ $(MAD_CFLAGS) \
$(FFMPEG_CFLAGS) \ $(FFMPEG_CFLAGS) \
$(CUE_CFLAGS) $(CUE_CFLAGS)
...@@ -345,6 +346,7 @@ DECODER_LIBS = \ ...@@ -345,6 +346,7 @@ DECODER_LIBS = \
$(SIDPLAY_LIBS) \ $(SIDPLAY_LIBS) \
$(FLUIDSYNTH_LIBS) \ $(FLUIDSYNTH_LIBS) \
$(WILDMIDI_LIBS) \ $(WILDMIDI_LIBS) \
$(WAVPACK_LIBS) \
$(MAD_LIBS) \ $(MAD_LIBS) \
$(MP4FF_LIBS) \ $(MP4FF_LIBS) \
$(FFMPEG_LIBS) \ $(FFMPEG_LIBS) \
......
configure.ac
View file @ a620e936
...@@ -829,11 +829,8 @@ AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes) ...@@ -829,11 +829,8 @@ AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes)
if test x$enable_wavpack = xyes; then if test x$enable_wavpack = xyes; then
PKG_CHECK_MODULES([WAVPACK], [wavpack], PKG_CHECK_MODULES([WAVPACK], [wavpack],
[enable_wavpack=yes; [AC_DEFINE([HAVE_WAVPACK], 1,
AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])],
[Define to enable WavPack support])]
MPD_LIBS="$MPD_LIBS $WAVPACK_LIBS"
MPD_CFLAGS="$MPD_CFLAGS $WAVPACK_CFLAGS",
enable_wavpack=no) enable_wavpack=no)
fi fi
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment