aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--configure.ac22
1 files changed, 10 insertions, 12 deletions
diff --git a/configure.ac b/configure.ac
index f06988ec6..5e21bae29 100644
--- a/configure.ac
+++ b/configure.ac
@@ -335,10 +335,9 @@ fi
AM_CONDITIONAL(HAVE_CURL, test x$enable_curl = xyes)
if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then
- enable_shout=yes
- PKG_CHECK_MODULES([SHOUT], [shout],
- AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]),
- enable_shout=no)
+ PKG_CHECK_MODULES([SHOUT], [shout],,
+ [enable_shout_ogg=no; enable_shout_mp3=no;
+ AC_MSG_WARN([disabling shout streaming support because libshout is not available])])
fi
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])
enable_shout_ogg=no
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
PKG_CHECK_MODULES(VORBISENC, [vorbisenc],
AC_DEFINE(HAVE_SHOUT_OGG, 1, [Define to enable ogg streaming support]),
@@ -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])
enable_shout_mp3=no
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
AC_DEFINE(HAVE_SHOUT_MP3, 1, [Define to enable mp3 streaming support])
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_OGG, test x$enable_shout_ogg = xyes)
AM_CONDITIONAL(HAVE_SHOUT_MP3, test x$enable_shout_mp3 = xyes)