summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-01 21:30:53 +0200
committerUoti Urpala <uau@glyph.nonexistent.invalid>2011-02-01 21:30:53 +0200
commit3bf725c39f3e3764270fe9088e70098960b4e8dd (patch)
tree5d30bac0fcf5c4a70a423adc0a71789e0bdecea9
parent6122d83981b85997e1fc1e3962c7aca3c3ab6714 (diff)
downloadmpv-3bf725c39f3e3764270fe9088e70098960b4e8dd.tar.bz2
mpv-3bf725c39f3e3764270fe9088e70098960b4e8dd.tar.xz
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.
-rwxr-xr-xconfigure12
1 files 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