[MPlayer-cvslog] r32979 - trunk/configure

[reimar]

Author: reimar
Date: Sun Feb 27 16:25:20 2011
New Revision: 32979

Log:
Fix compilation for systems where vorbis encode is split out into
libvorbisenc.
Note that vorbis support will be completely disabled for systems
that use the split libraries but do not have libvorbisenc installed.
That should be ok since there shouldn't be a real need to use libvorbis
for decoding.

Modified:
   trunk/configure

Modified: trunk/configure
==============================================================================
--- trunk/configure	Sun Feb 27 16:14:23 2011	(r32978)
+++ trunk/configure	Sun Feb 27 16:25:20 2011	(r32979)
@@ -6295,7 +6295,9 @@ elif test "$_tremor" = auto; then
 fi
 if test "$_libvorbis" = auto; then
   _libvorbis=no
-  statement_check vorbis/codec.h 'vorbis_packet_blocksize(0, 0)' -lvorbis -logg $_ld_lm && _libvorbis=yes
+  for vorbislibs in '-lvorbis -logg' '-lvorbis -lvorbisenc -logg' ; do
+    statement_check vorbis/vorbisenc.h 'vorbis_encode_ctl(0, 0, 0)' $vorbislibs $_ld_lm && _libvorbis=yes && break
+  done
 fi
 if test "$_tremor_internal" = yes ; then
   _vorbis=yes
@@ -6319,7 +6321,7 @@ elif test "$_libvorbis" = yes ; then
   def_vorbis='#define CONFIG_OGGVORBIS 1'
   codecmodules="libvorbis $codecmodules"
   res_comment="libvorbis"
-  extra_ldflags="$extra_ldflags -lvorbis -logg"
+  extra_ldflags="$extra_ldflags $vorbislibs"
   libavencoders="$libavencoders LIBVORBIS_ENCODER"
 else
   _vorbis=no