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

configure: Merge lame*encoder to lame

Browse Source
This commit is contained in:
Avuton Olrich 2009-03-16 08:44:48 +01:00 committed by Max Kellermann
parent b356bcf6fa
commit f35432af5a
1 changed files with 5 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
configure.ac
View File

@ -504,7 +504,7 @@ dnl
AC_ARG_ENABLE(lame, AC_ARG_ENABLE(lame,
AS_HELP_STRING([--disable-lame], AS_HELP_STRING([--disable-lame],
[disable lame support (default: enable)]),, [disable support for mp3 streaming (default: enable)]),,
enable_lame=yes) enable_lame=yes)
@ -563,11 +563,6 @@ AC_ARG_ENABLE(oggvorbis-encoder,
[disable support for ogg streaming (default: enable)]),, [disable support for ogg streaming (default: enable)]),,
[enable_oggvorbis_encoder=yes]) [enable_oggvorbis_encoder=yes])
AC_ARG_ENABLE(lame-encoder,
AS_HELP_STRING([--disable-lame-encoder],
[disable support for mp3 streaming (default: enable)]),,
[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],
[enables the HTTP server output (default: disable)]),, [enables the HTTP server output (default: disable)]),,
@ -621,13 +616,6 @@ 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_lame_encoder = xyes; then
if test x$enable_lame = xno; then
AC_MSG_WARN([disabling mp3 shout streaming support because lame is not enabled])
enable_lame_encoder=no
fi
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)
@ -636,8 +624,8 @@ 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_lame_encoder = xyes) AM_CONDITIONAL(ENABLE_LAME_ENCODER, test x$enable_lame = xyes)
if test x$enable_lame_encoder = xyes; then if test x$enable_lame = 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
@ -1177,7 +1165,7 @@ if
test x$enable_shout = xyes || test x$enable_shout = xyes ||
test x$enable_httpd_output = xyes; then test x$enable_httpd_output = xyes; then
echo " Streaming Encoder Support:" echo " Streaming Encoder Support:"
if test x$enable_lame_encoder = xyes; then if test x$enable_lame = xyes; then
echo " LAME mp3 encoder ..............enabled" echo " LAME mp3 encoder ..............enabled"
else else
echo " LAME mp3 encoder ..............disabled" echo " LAME mp3 encoder ..............disabled"
@ -1192,7 +1180,7 @@ if
if if
test x$enable_oggvorbis_encoder = xno && test x$enable_oggvorbis_encoder = xno &&
test x$enable_lame_encoder = xno; then test x$enable_lame = xno; then
AC_MSG_ERROR([Cannot enable a streaming output without an encoder.]) AC_MSG_ERROR([Cannot enable a streaming output without an encoder.])
fi fi
fi fi