Also check for (and link with) libvorbis.

This commit is contained in:
Michael Jumper 2013-07-09 00:58:14 -07:00
parent edf9762667
commit 3646bdbbbf

View File

@ -110,18 +110,19 @@ AC_SUBST(init_dir)
# Ogg Vorbis # Ogg Vorbis
# #
have_vorbisenc=yes have_vorbis=yes
VORBIS_LIBS= VORBIS_LIBS=
AC_CHECK_HEADER(vorbis/vorbisenc.h,, [have_vorbisenc=no]) AC_CHECK_HEADER(vorbis/vorbisenc.h,, [have_vorbis=no])
AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], [VORBIS_LIBS="$VORBIS_LIBS -lvorbisenc"], [have_vorbisenc=no]) AC_CHECK_LIB([vorbisenc], [vorbis_encode_init], [VORBIS_LIBS="$VORBIS_LIBS -lvorbisenc"], [have_vorbis=no])
AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbisenc}" = "xyes"]) AC_CHECK_LIB([vorbis], [vorbis_block_init], [VORBIS_LIBS="$VORBIS_LIBS -lvorbis"], [have_vorbis=no])
AM_CONDITIONAL([ENABLE_OGG], [test "x${have_vorbis}" = "xyes"])
if test "x${have_vorbisenc}" = "xno" if test "x${have_vorbis}" = "xno"
then then
AC_MSG_WARN([ AC_MSG_WARN([
-------------------------------------------- --------------------------------------------
Unable to find libvorbisenc. Unable to find libvorbis / libvorbisenc.
Sound will not be encoded with Ogg Vorbis. Sound will not be encoded with Ogg Vorbis.
--------------------------------------------]) --------------------------------------------])
else else
@ -229,7 +230,7 @@ $PACKAGE_NAME version $PACKAGE_VERSION
pango ............... ${have_pango} pango ............... ${have_pango}
libssh .............. ${have_libssh} libssh .............. ${have_libssh}
libVNCServer ........ ${have_libvncserver} libVNCServer ........ ${have_libvncserver}
libvorbisenc ........ ${have_vorbisenc} libvorbis ........... ${have_vorbis}
Protocol support: Protocol support: