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
AC_DEFINE(ENABLE_LAME_ENCODER, 1,
[Define to enable the lame encoder plugin])
fi
@@ -703,7 +687,7 @@ if test x$enable_jack = xyes; then
[Define to enable JACK support])]
MPD_LIBS="$MPD_LIBS $JACK_LIBS"
MPD_CFLAGS="$MPD_CFLAGS $JACK_CFLAGS",
- [enable_jack=no;AC_MSG_WARN([JACK not found -- disabling])])
+ enable_jack=no)
fi
if test x$enable_jack = xyes; then
@@ -779,8 +763,7 @@ if test x$enable_wavpack = xyes; then
[Define to enable WavPack support])]
MPD_LIBS="$MPD_LIBS $WAVPACK_LIBS"
MPD_CFLAGS="$MPD_CFLAGS $WAVPACK_CFLAGS",
- [enable_wavpack=no;
- AC_MSG_WARN([WavPack not found -- disabling])])
+ enable_wavpack=no)
fi
AM_CONDITIONAL(HAVE_WAVPACK, test x$enable_wavpack = xyes)
@@ -1105,6 +1088,12 @@ else
echo " FIFO support ..................disabled"
fi
+if test x$enable_httpd_output = xyes; then
+ echo " HTTP daemon support ...........enabled"
+else
+ echo " HTTP daemon support ...........disabled"
+fi
+
if test x$enable_jack = xyes; then
echo " JACK support ..................enabled"
else
@@ -1149,35 +1138,17 @@ fi
if test x$enable_shout = xyes; then
echo " SHOUTcast support .............enabled"
-
- if test x$enable_shout_mp3 = xyes; then
- echo " with LAME mp3 encoder .......enabled"
- else
- echo " with LAME mp3 encoder .......disabled"
- fi
-
- if test x$enable_shout_ogg = xyes; then
- echo " with Ogg Vorbis encoder .....enabled"
- else
- echo " with Ogg Vorbis encoder .....disabled"
- fi
else
echo " SHOUTcast support .............disabled"
fi
-if test x$enable_httpd_output = xyes; then
- echo " HTTP daemon support ...........enabled"
-else
- echo " HTTP daemon support ...........disabled"
-fi
-
echo ""
if
test x$enable_ao = xno &&
test x$enable_oss = xno &&
- test x$enable_shout_ogg = xno &&
- test x$enable_shout_mp3 = xno &&
+ test x$enable_shout = xno &&
+ test x$enable_httpd_output = xno &&
test x$enable_alsa = xno &&
test x$enable_osx = xno &&
test x$enable_pulse = xno &&
@@ -1188,6 +1159,30 @@ if
AC_MSG_ERROR([No Audio Output types configured!])
fi
+if
+ test x$enable_shout = xyes ||
+ test x$enable_httpd_output = xyes; then
+ echo " Streaming Encoder Support:"
+ if test x$enable_lame = xyes; then
+ echo " LAME mp3 encoder ..............enabled"
+ else
+ echo " LAME mp3 encoder ..............disabled"
+ fi
+
+ if test x$enable_oggvorbis_encoder = xyes; then
+ echo " Ogg Vorbis encoder ............enabled"
+ else
+ echo " Ogg Vorbis encoder ............disabled"
+ fi
+ echo ""
+
+ if
+ test x$enable_oggvorbis_encoder = xno &&
+ test x$enable_lame = xno; then
+ AC_MSG_ERROR([Cannot enable a streaming output without an
encoder.])
+ fi
+fi
+
echo " File Format Support:"
if test x$enable_aac = xyes; then
--
avuton
--
| (\_/) This is Bunny. Copy and paste Bunny
| (='.'=) into your signature to help him gain
| (")_(") world domination.
------------------------------------------------------------------------------
Apps built with the Adobe(R) Flex(R) framework and Flex Builder(TM) are
powering Web 2.0 with engaging, cross-platform capabilities. Quickly and
easily build your RIAs with Flex Builder, the Eclipse(TM)based development
software that enables intelligent coding and step-through debugging.
Download the free 60 day trial. http://p.sf.net/sfu/www-adobe-com
_______________________________________________
Musicpd-dev-team mailing list
Musicpd-dev-team@lists.sourceforge.net
https://lists.sourceforge.net/lists/listinfo/musicpd-dev-team
