From 3bf725c39f3e3764270fe9088e70098960b4e8dd Mon Sep 17 00:00:00 2001 From: Uoti Urpala Date: Tue, 1 Feb 2011 21:30:53 +0200 Subject: configure: prefer libvorbis to libvorbisidec/tremor libvorbis and libvorbisidec cannot both be enabled at the same time. Change configure to enable libvorbis by default if both are available. It's the more common library, and if someone want to do a special build for FPU-less systems he can select the library manually. --- configure | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/configure b/configure index 1e39c18a30..0fe2e64f06 100755 --- a/configure +++ b/configure @@ -366,8 +366,8 @@ Codecs: --disable-xvid disable Xvid [autodetect] --disable-libnut disable libnut [autodetect] --disable-ffmpeg disable FFmpeg [autodetect] - --disable-tremor disable Tremor [autodetect] --disable-libvorbis disable libvorbis support [autodetect] + --disable-tremor disable Tremor [autodetect if no libvorbis] --disable-speex disable Speex support [autodetect] --enable-theora enable OggTheora libraries [autodetect] --enable-faad enable FAAD2 (AAC) [autodetect] @@ -5661,13 +5661,13 @@ fi echores "$_mad" echocheck "OggVorbis support" -if test "$_tremor" = auto; then - _tremor=no - statement_check tremor/ivorbiscodec.h 'vorbis_packet_blocksize(0, 0)' -logg -lvorbisidec $_ld_lm && _tremor=yes && _libvorbis=no -fi if test "$_libvorbis" = auto; then _libvorbis=no - statement_check vorbis/codec.h 'vorbis_packet_blocksize(0, 0)' -lvorbis -logg $_ld_lm && _libvorbis=yes + statement_check vorbis/codec.h 'vorbis_packet_blocksize(0, 0)' -lvorbis -logg $_ld_lm && _libvorbis=yes && _tremor=no +fi +if test "$_tremor" = auto; then + _tremor=no + statement_check tremor/ivorbiscodec.h 'vorbis_packet_blocksize(0, 0)' -logg -lvorbisidec $_ld_lm && _tremor=yes fi if test "$_tremor" = yes ; then _vorbis=yes -- cgit v1.2.3