Skip to content

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

configure.ac: use more MPD_AUTO_PKG()

Fail when a feature is enabled, but the library is not found.
parent a620e936
Show whitespace changes
Inline Side-by-side
Showing with 19 additions and 24 deletions
configure.ac
View file @ b1afa40f
...@@ -389,13 +389,18 @@ dnl ...@@ -389,13 +389,18 @@ dnl
dnl decoder plugins dnl decoder plugins
dnl dnl
AC_ARG_ENABLE(audiofile, AC_ARG_ENABLE(audiofile,
AS_HELP_STRING([--disable-audiofile], AS_HELP_STRING([--enable-audiofile],
[disable audiofile support, disables wave support (default: enable)]),, [enable audiofile support, disables wave support]),,
enable_audiofile=yes) enable_audiofile=yes)
MPD_AUTO_PKG(audiofile, AUDIOFILE, [audiofile >= 0.1.7],
[audiofile decoder plugin], [libaudiofile not found])
AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
if test x$enable_audiofile = xyes; then
AC_DEFINE(HAVE_AUDIOFILE, 1, [Define for audiofile support])
fi
AC_ARG_ENABLE(ffmpeg, AC_ARG_ENABLE(ffmpeg,
AS_HELP_STRING([--disable-ffmpeg], AS_HELP_STRING([--disable-ffmpeg],
[enable FFMPEG support (default: enable)]),, [enable FFMPEG support (default: enable)]),,
...@@ -561,9 +566,16 @@ AC_ARG_ENABLE(wildmidi, ...@@ -561,9 +566,16 @@ AC_ARG_ENABLE(wildmidi,
enable_wildmidi=no) enable_wildmidi=no)
AC_ARG_ENABLE(wavpack, AC_ARG_ENABLE(wavpack,
AS_HELP_STRING([--disable-wavpack], AS_HELP_STRING([--enable-wavpack],
[disable WavPack support (default: enable)]),, [enable WavPack support]),,
enable_wavpack=yes) enable_wavpack=auto)
MPD_AUTO_PKG(wavpack, WAVPACK, [wavpack],
[WavPack decoder plugin], [libwavpack not found])
AM_CONDITIONAL(HAVE_WAVPACK, test x$enable_wavpack = xyes)
if test x$enable_wavpack = xyes; then
AC_DEFINE([HAVE_WAVPACK], 1, [Define to enable WavPack support])
fi
dnl dnl
...@@ -827,15 +839,6 @@ fi ...@@ -827,15 +839,6 @@ fi
AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes) AM_CONDITIONAL(HAVE_MPCDEC, test x$enable_mpc = xyes)
if test x$enable_wavpack = xyes; then
PKG_CHECK_MODULES([WAVPACK], [wavpack],
[AC_DEFINE([HAVE_WAVPACK], 1,
[Define to enable WavPack support])],
enable_wavpack=no)
fi
AM_CONDITIONAL(HAVE_WAVPACK, test x$enable_wavpack = xyes)
AM_PATH_FAAD() AM_PATH_FAAD()
AM_CONDITIONAL(HAVE_FAAD, test x$enable_aac = xyes) AM_CONDITIONAL(HAVE_FAAD, test x$enable_aac = xyes)
...@@ -924,14 +927,6 @@ AM_CONDITIONAL(HAVE_FLAC_COMMON, ...@@ -924,14 +927,6 @@ AM_CONDITIONAL(HAVE_FLAC_COMMON,
AM_CONDITIONAL(HAVE_OGG_COMMON, AM_CONDITIONAL(HAVE_OGG_COMMON,
test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes) test x$enable_vorbis = xyes || test x$enable_oggflac = xyes || test x$enable_flac = xyes)
if test x$enable_audiofile = xyes; then
PKG_CHECK_MODULES(AUDIOFILE, [audiofile >= 0.1.7],
AC_DEFINE(HAVE_AUDIOFILE, 1, [Define for audiofile support]),
enable_audiofile=no)
fi
AM_CONDITIONAL(HAVE_AUDIOFILE, test x$enable_audiofile = xyes)
if test x$enable_ffmpeg = xyes; then if test x$enable_ffmpeg = xyes; then
PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],, PKG_CHECK_MODULES(FFMPEG, [libavformat libavcodec libavutil],,
enable_ffmpeg=no) enable_ffmpeg=no)
......
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