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

configure.ac: don't check for encoders when shout/httpd disabled

Browse Source 
Use the new $need_encoder variable to determine whether encoder
plugins would actually be used if they were available.
This commit is contained in:
Max Kellermann 2009-04-01 22:03:37 +02:00
parent 1d0b2c5679
commit 9509bd460f
1 changed files with 19 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
configure.ac
View File

@ -939,6 +939,20 @@ dnl
dnl Encoder API and shout/httpd output plugin dnl Encoder API and shout/httpd output plugin
dnl dnl
if test x$enable_shout = xyes || test x$enable_httpd_output = xyes; then
# at least one output using encoders is explicitly enabled
need_encoder=yes
elif test x$enable_shout = xauto || test x$enable_httpd_output = xauto; then
need_encoder=auto
else
# all outputs using encoders are disabled
need_encoder=no
# don't bother to check for encoder plugins
enable_oggvorbis_encoder=no
enable_lame=no
fi
if test x$enable_oggvorbis_encoder = 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])
@ -967,8 +981,13 @@ if test x$enable_oggvorbis_encoder != xno || test x$enable_lame != xno; then
else else
# no encoder plugin is enabled: disable the whole encoder API # no encoder plugin is enabled: disable the whole encoder API
enable_encoder=no enable_encoder=no
if test x$need_encoder = xyes; then
AC_MSG_ERROR([No encoder plugin found])
fi
fi fi
if test x$enable_shout = xauto; then if test x$enable_shout = xauto; then
# handle shout auto-detection: disable if no encoder is # handle shout auto-detection: disable if no encoder is
# available # available
@ -1242,10 +1261,6 @@ if
echo " Ogg Vorbis encoder ............disabled" echo " Ogg Vorbis encoder ............disabled"
fi fi
echo "" echo ""
if test x$enable_encoder = xno; then
AC_MSG_ERROR([Cannot enable a streaming output without an encoder.])
fi
fi fi
echo " File Format Support:" echo " File Format Support:"