oysteikt/mpd
0
0
Fork 0
Code Issues Pull Requests Releases Activity

configure: replace all instances shout*[mp3|ogg] with [lame|oggvorbis]*encoder

Browse Source
This commit is contained in:
Avuton Olrich 2009-03-15 11:44:05 -07:00
parent 870706519a
commit a672cf1c63
1 changed files with 26 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
configure.ac
View File

@ -558,15 +558,15 @@ AC_ARG_ENABLE(pulse,
[disable support for the PulseAudio sound server (default: enable)]),, [disable support for the PulseAudio sound server (default: enable)]),,
enable_pulse=yes) enable_pulse=yes)
AC_ARG_ENABLE(shout-ogg, AC_ARG_ENABLE(oggvorbis-encoder,
AS_HELP_STRING([--disable-shout-ogg], AS_HELP_STRING([--disable-oggvorbis-encoder],
[disable support for ogg streaming through shout (default: enable)]),, [disable support for ogg streaming (default: enable)]),,
[enable_shout_ogg=yes]) [enable_oggvorbis_encoder=yes])
AC_ARG_ENABLE(shout-mp3, AC_ARG_ENABLE(lame-encoder,
AS_HELP_STRING([--disable-shout-mp3], AS_HELP_STRING([--disable-lame-encoder],
[disable support for mp3 streaming through shout (default: enable)]),, [disable support for mp3 streaming (default: enable)]),,
[enable_shout_mp3=yes]) [enable_lame_encoder=yes])
AC_ARG_ENABLE(httpd-output, AC_ARG_ENABLE(httpd-output,
AS_HELP_STRING([--enable-httpd-output], AS_HELP_STRING([--enable-httpd-output],
@ -588,24 +588,24 @@ esac
AM_CONDITIONAL(HAVE_OSX, test x$enable_osx = xyes) AM_CONDITIONAL(HAVE_OSX, test x$enable_osx = xyes)
if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then if test x$enable_oggvorbis_encoder = xyes || test x$enable_lame_encoder = xyes; then
PKG_CHECK_MODULES([SHOUT], [shout],, PKG_CHECK_MODULES([SHOUT], [shout],,
[enable_shout_ogg=no; enable_shout_mp3=no; [enable_oggvorbis_encoder=no; enable_lame_encoder=no;
AC_MSG_WARN([disabling shout streaming support because libshout is not available])]) AC_MSG_WARN([disabling shout streaming support because libshout is not available])])
fi fi
if test x$enable_shout_ogg = xyes; then if test x$enable_oggvorbis_encoder = xyes; then
if test x$enable_oggvorbis = xno; then if test x$enable_oggvorbis = xno; then
AC_MSG_WARN([disabling ogg shout streaming support because vorbis is not enabled]) AC_MSG_WARN([disabling ogg shout streaming support because vorbis is not enabled])
enable_shout_ogg=no enable_oggvorbis_encoder=no
fi fi
if test x$use_tremor = xyes; then if test x$use_tremor = 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_oggvorbis_encoder=no
fi fi
if test x$enable_shout_ogg = xyes; then if test x$enable_oggvorbis_encoder = xyes; then
PKG_CHECK_MODULES(VORBISENC, [vorbisenc],, PKG_CHECK_MODULES(VORBISENC, [vorbisenc],,
enable_shout_ogg=no) enable_oggvorbis_encoder=no)
fi fi
fi fi
@ -616,14 +616,14 @@ if test x$enable_lame = xyes; then
AC_MSG_WARN(You need lame -- disabling lame support)]) AC_MSG_WARN(You need lame -- disabling lame support)])
fi fi
if test x$enable_shout_mp3 = xyes; then if test x$enable_lame_encoder = xyes; then
if test x$enable_lame = xno; then if test x$enable_lame = xno; 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_lame_encoder=no
fi fi
fi fi
if test x$enable_shout_ogg = xyes || test x$enable_shout_mp3 = xyes; then if test x$enable_oggvorbis_encoder = xyes || test x$enable_lame_encoder = xyes; then
enable_shout=yes enable_shout=yes
AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support]) AC_DEFINE(HAVE_SHOUT, 1, [Define to enable libshout support])
else else
@ -633,13 +633,13 @@ fi
AM_CONDITIONAL(HAVE_SHOUT, test x$enable_shout = xyes) 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_ENCODER, test x$enable_shout = xyes || test x$enable_httpd_output = xyes)
AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_shout_ogg = xyes) AM_CONDITIONAL(ENABLE_VORBIS_ENCODER, test x$enable_oggvorbis_encoder = xyes)
if test x$enable_shout_ogg = xyes; then if test x$enable_oggvorbis_encoder = xyes; then
AC_DEFINE(ENABLE_VORBIS_ENCODER, 1, AC_DEFINE(ENABLE_VORBIS_ENCODER, 1,
[Define to enable the vorbis encoder plugin]) [Define to enable the vorbis encoder plugin])
fi fi
AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_shout_mp3 = xyes) AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame_encoder = xyes)
if test x$enable_shout_mp3 = xyes; then if test x$enable_lame_encoder = xyes; then
AC_DEFINE(ENABLE_LAME_ENCODER, 1, AC_DEFINE(ENABLE_LAME_ENCODER, 1,
[Define to enable the lame encoder plugin]) [Define to enable the lame encoder plugin])
fi fi
@ -1150,13 +1150,13 @@ fi
if test x$enable_shout = xyes; then if test x$enable_shout = xyes; then
echo " SHOUTcast support .............enabled" echo " SHOUTcast support .............enabled"
if test x$enable_shout_mp3 = xyes; then if test x$enable_lame_encoder = xyes; then
echo " with LAME mp3 encoder .......enabled" echo " with LAME mp3 encoder .......enabled"
else else
echo " with LAME mp3 encoder .......disabled" echo " with LAME mp3 encoder .......disabled"
fi fi
if test x$enable_shout_ogg = xyes; then if test x$enable_oggvorbis_encoder = xyes; then
echo " with Ogg Vorbis encoder .....enabled" echo " with Ogg Vorbis encoder .....enabled"
else else
echo " with Ogg Vorbis encoder .....disabled" echo " with Ogg Vorbis encoder .....disabled"
@ -1176,8 +1176,8 @@ echo ""
if if
test x$enable_ao = xno && test x$enable_ao = xno &&
test x$enable_oss = xno && test x$enable_oss = xno &&
test x$enable_shout_ogg = xno && test x$enable_oggvorbis_encoder = xno &&
test x$enable_shout_mp3 = xno && test x$enable_lame_encoder = xno &&
test x$enable_alsa = xno && test x$enable_alsa = xno &&
test x$enable_osx = xno && test x$enable_osx = xno &&
test x$enable_pulse = xno && test x$enable_pulse = xno &&