summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authorarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-03 22:13:06 +0000
committerarpi <arpi@b3059339-0415-0410-9bf9-f77b7e298cf2>2002-05-03 22:13:06 +0000
commitf958fc46bca610e656ff3799489f27222e01683c (patch)
tree122feaf81c7ce5829412229807e44971f97b960f /configure
parent497fa655c96aa6e89bbac3415bda896777629a51 (diff)
downloadmpv-f958fc46bca610e656ff3799489f27222e01683c.tar.bz2
mpv-f958fc46bca610e656ff3799489f27222e01683c.tar.xz
enable libfame only for dxr3/dvb owners by default, libfame check moved right after libmp1e check
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5961 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure49
1 files changed, 28 insertions, 21 deletions
diff --git a/configure b/configure
index 30857dfdc7..627b4e9fad 100755
--- a/configure
+++ b/configure
@@ -132,7 +132,7 @@ Optional features:
--disable-divx4linux disable DivX4linux codec [autodetect]
--enable-opendivx enable _old_ OpenDivx codec [disable]
--disable-libavcodec disable libavcodec [autodetect]
- --disable-libfame disable libfame realtime-encoder [autodetect]
+ --enable-libfame enable libfame realtime-encoder [autodetect]
--enable-vorbis build with OggVorbis support [autodetect]
--enable-faad build with FAAD (AAC) support [autodetect]
--disable-iconv do not use iconv(3) function [autodetect]
@@ -2448,6 +2448,33 @@ else
fi
echores "$_mp1e"
+
+echocheck "libfame"
+if test "$_fame" = auto ; then
+ _fame=no
+ test "$_dxr3" = yes && _fame=auto
+ test "$_dvb" = yes && _fame=auto
+fi
+if test "$_fame" = auto ; then
+ _fame=no
+ if test -d libfame && test -f libfame/fame.h ; then
+ # disable fame on cygwin as no sense to port - atmos
+ cygwin || _fame=yes
+ echores $_fame
+ else
+ echores "no (no fame dir)"
+ fi
+else
+ echores "$_fame"
+fi
+
+_def_fame='#undef USE_LIBFAME'
+if test "$_fame" = yes ; then
+ _def_fame='#define USE_LIBFAME 1'
+ _ld_fame='-Llibfame -lfame'
+fi
+
+
#########
# AUDIO #
#########
@@ -3059,26 +3086,6 @@ else
_nocodecmodules="libavcodec $_nocodecmodules"
fi
-echocheck "libfame"
-if test "$_fame" = auto ; then
- _fame=no
- if test -d libfame && test -f libfame/fame.h ; then
- # disable fame on cygwin as no sense to port - atmos
- cygwin || _fame=yes
- echores $_fame
- else
- echores "no (no fame dir)"
- fi
-else
- echores "$_fame"
-fi
-
-_def_fame='#undef USE_LIBFAME'
-if test "$_fame" = yes ; then
- _def_fame='#define USE_LIBFAME 1'
- _ld_fame='-Llibfame -lfame'
-fi
-
echocheck "libdv-0.9.5 (for mencoder)"
if test "$_libdv" = auto ; then
_libdv=no