Skip to content

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

configure.ac: disable shout when no encoder is found

First check if an ecoder plugin is available, then determine whether to enable the shout output plugin.
parent 213c021e
Hide whitespace changes
Inline Side-by-side
Showing with 10 additions and 12 deletions
configure.ac
View file @ caf60119
...@@ -335,10 +335,9 @@ fi ...@@ -335,10 +335,9 @@ fi
AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes) AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes)
if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then
enable_shout=yes PKG_CHECK_MODULES([SHOUT], [shout],,
PKG_CHECK_MODULES([SHOUT], [shout], [enable_shout_ogg=no; enable_shout_mp3=no;
AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]), AC_MSG_WARN([disabling shout streaming support because libshout is not available])])
enable_shout=no)
fi fi
if test x$enable_shout_ogg = xyes; then if test x$enable_shout_ogg = xyes; then
...@@ -350,10 +349,6 @@ if test x$enable_shout_ogg = xyes; then ...@@ -350,10 +349,6 @@ if test x$enable_shout_ogg = xyes; then
AC_MSG_WARN([disabling ogg shout streaming support because tremor does not support vorbis encoding]) AC_MSG_WARN([disabling ogg shout streaming support because tremor does not support vorbis encoding])
enable_shout_ogg=no enable_shout_ogg=no
fi fi
if test x$enable_shout = xno; then
AC_MSG_WARN([disabling ogg shout streaming support because libshout is not found])
enable_shout_ogg=no
fi
if test x$enable_shout_ogg = xyes; then if test x$enable_shout_ogg = xyes; then
PKG_CHECK_MODULES(VORBISENC, [vorbisenc], PKG_CHECK_MODULES(VORBISENC, [vorbisenc],
AC_DEFINE(HAVE_SHOUT_OGG, 1, [Define to enable ogg streaming support]), AC_DEFINE(HAVE_SHOUT_OGG, 1, [Define to enable ogg streaming support]),
...@@ -366,15 +361,18 @@ if test x$enable_shout_mp3 = xyes; then ...@@ -366,15 +361,18 @@ if test x$enable_shout_mp3 = xyes; then
AC_MSG_WARN([disabling mp3 shout streaming support because lame is not enabled]) AC_MSG_WARN([disabling mp3 shout streaming support because lame is not enabled])
enable_shout_mp3=no enable_shout_mp3=no
fi fi
if test x$enable_shout = xno; then
AC_MSG_WARN([disabling mp3 shout streaming support because libshout is not found])
enable_shout_mp3=no
fi
if test x$enable_shout_mp3 = xyes; then if test x$enable_shout_mp3 = xyes; then
AC_DEFINE(HAVE_SHOUT_MP3, 1, [Define to enable mp3 streaming support]) AC_DEFINE(HAVE_SHOUT_MP3, 1, [Define to enable mp3 streaming support])
fi fi
fi fi
if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then
enable_shout=yes
AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support])
else
enable_shout=no
fi
AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes)
AM_CONDITIONAL(HAVE_SHOUT_OGG, test x$enable_shout_ogg = xyes) AM_CONDITIONAL(HAVE_SHOUT_OGG, test x$enable_shout_ogg = xyes)
AM_CONDITIONAL(HAVE_SHOUT_MP3, test x$enable_shout_mp3 = xyes) AM_CONDITIONAL(HAVE_SHOUT_MP3, test x$enable_shout_mp3 = xyes)
......
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