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

configure.ac: fail when vorbis encoder is enabled but not found

Browse Source 
Use MPD_AUTO_PKG().  Removed the checks for the Ogg Vorbis decoder
plugin, this is not directly related.
This commit is contained in:
Max Kellermann 2009-04-01 22:05:07 +02:00
parent 9509bd460f
commit 0a62bdaded
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

@ -516,9 +516,9 @@ dnl encoder plugins
dnl dnl
AC_ARG_ENABLE(oggvorbis-encoder, AC_ARG_ENABLE(oggvorbis-encoder,
AS_HELP_STRING([--disable-oggvorbis-encoder], AS_HELP_STRING([--enable-oggvorbis-encoder],
[disable support for ogg streaming (default: enable)]),, [enable support for ogg streaming]),,
[enable_oggvorbis_encoder=yes]) [enable_oggvorbis_encoder=auto])
AC_ARG_ENABLE(lame, AC_ARG_ENABLE(lame,
AS_HELP_STRING([--disable-lame], AS_HELP_STRING([--disable-lame],
@ -953,20 +953,8 @@ else
enable_lame=no enable_lame=no
fi fi
if test x$enable_oggvorbis_encoder = xyes; then MPD_AUTO_PKG(oggvorbis_encoder, VORBISENC, [vorbisenc],
if test x$enable_oggvorbis = xno; then [Ogg Vorbis encoder], [libvorbisenc not found])
AC_MSG_WARN([disabling ogg shout streaming support because vorbis is not enabled])
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_oggvorbis_encoder=no
fi
if test x$enable_oggvorbis_encoder = xyes; then
PKG_CHECK_MODULES(VORBISENC, [vorbisenc],,
enable_oggvorbis_encoder=no)
fi
fi
if test x$enable_lame = xyes; then if test x$enable_lame = xyes; then
AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS" AM_PATH_LAME([MPD_LIBS="$MPD_LIBS $LAME_LIBS"