Hi Max,
Please pull from my tree, lots of cleanups for generalization post
http output. The one patch removes unnecessary warnings against
various optional libaries; if these warnings are going to be displayed
they should only be when the user tries to enable them.
--
Avuton Olrich (8):
configure: replace all instances shout*[mp3|ogg] with
[lame|oggvorbis]*encoder
configure: Move encoders to their own report section.
configure: Fail if trying to build with streaming output and no encoder
configure: add shout autoconf argument.
configure: Always run pkg-config for shout, define AC_DEFINE if enabled
configure: error out against streaming output, not encoder.
configure: don't warn just because we don't have an optional library.
configure: Merge lame*encoder to lame
configure.ac | 117 --
1 files changed, 56 insertions(+), 61 deletions(-)
diff --git a/configure.ac b/configure.ac
index 283f5bc..06892be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -504,7 +504,7 @@ dnl
AC_ARG_ENABLE(lame,
AS_HELP_STRING([--disable-lame],
- [disable lame support (default: enable)]),,
+ [disable support for mp3 streaming (default: enable)]),,
enable_lame=yes)
@@ -558,15 +558,10 @@ AC_ARG_ENABLE(pulse,
[disable support for the PulseAudio sound server (default:
enable)]),,
enable_pulse=yes)
-AC_ARG_ENABLE(shout-ogg,
- AS_HELP_STRING([--disable-shout-ogg],
- [disable support for ogg streaming through shout (default:
enable)]),,
- [enable_shout_ogg=yes])
-
-AC_ARG_ENABLE(shout-mp3,
- AS_HELP_STRING([--disable-shout-mp3],
- [disable support for mp3 streaming through shout (default:
enable)]),,
- [enable_shout_mp3=yes])
+AC_ARG_ENABLE(oggvorbis-encoder,
+ AS_HELP_STRING([--disable-oggvorbis-encoder],
+ [disable support for ogg streaming (default: enable)]),,
+ [enable_oggvorbis_encoder=yes])
AC_ARG_ENABLE(httpd-output,
AS_HELP_STRING([--enable-httpd-output],
@@ -588,24 +583,27 @@ esac
AM_CONDITIONAL(HAVE_OSX, test x$enable_osx = xyes)
-if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then
- 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
+AC_ARG_ENABLE(shout,
+ AS_HELP_STRING([--enable-shout],
+ [enables the shoutcast streaming output (default: disable)]),,
+ [enable_shout=no])
+
+PKG_CHECK_MODULES([SHOUT], [shout],
+ AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]),
+ enable_shout=no)
-if test x$enable_shout_ogg = xyes; then
+if test x$enable_oggvorbis_encoder = xyes; then
if test x$enable_oggvorbis = xno; then
AC_MSG_WARN([disabling ogg shout streaming support because
vorbis
is not enabled])
- enable_shout_ogg=no
+ enable_oggvorbis_encoder=no
fi
if test x$use_tremor = xyes; then
AC_MSG_WARN([disabling ogg shout streaming support because
tremor
does not support vorbis encoding])
- enable_shout_ogg=no
+ enable_oggvorbis_encoder=no
fi
- if test x$enable_shout_ogg = xyes; then
+ if test x$enable_oggvorbis_encoder = xyes; then
PKG_CHECK_MODULES(VORBISENC, [vorbisenc],,
- enable_shout_ogg=no)
+ enable_oggvorbis_encoder=no)
fi
fi
@@ -616,30 +614,16 @@ if test x$enable_lame = xyes; then
AC_MSG_WARN(You need lame -- disabling lame support)])
fi
-if test x$enable_shout_mp3 = xyes; then
- if test x$enable_lame = xno; then
- AC_MSG_WARN([disabling mp3 shout streaming support because lame
is
not enabled])
- enable_shout_mp3=no
- 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(ENABLE_ENCODER, test x$enable_shout = xyes || test
x$enable_httpd_output = xyes)
-AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_shout_ogg = xyes)
-if test x$enable_shout_ogg = xyes; then
+AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_oggvorbis_encoder = xyes)
+if test x$enable_oggvorbis_encoder = xyes; then
AC_DEFINE(ENABLE_VORBIS_ENCODER, 1,
[Define to enable the vorbis encoder plugin])
fi
-AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_shout_mp3 = xyes)
-if test x$enable_shout_mp3 = xyes; then
+AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame = xyes)
+if test x$enable_lame = xyes; then
