summaryrefslogtreecommitdiffstats
path: root/configure
diff options
context:
space:
mode:
authordiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-14 22:58:25 +0000
committerdiego <diego@b3059339-0415-0410-9bf9-f77b7e298cf2>2007-01-14 22:58:25 +0000
commita6cc078d267f91bba54d8a581952f5a67c22469f (patch)
treead082d9b2b1762c82f2227089c4e81d667347fd1 /configure
parent46305348a77cd08e4a3d54779a609686b15cf8e3 (diff)
downloadmpv-a6cc078d267f91bba54d8a581952f5a67c22469f.tar.bz2
mpv-a6cc078d267f91bba54d8a581952f5a67c22469f.tar.xz
Move toolame vs twolame logic into the $_toolame=auto case.
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21927 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure7
1 files changed, 5 insertions, 2 deletions
diff --git a/configure b/configure
index c4dfa8ac22..332d3c16f4 100755
--- a/configure
+++ b/configure
@@ -5659,15 +5659,18 @@ fi
echores "$_twolame"
echocheck "Toolame"
-test "$_twolame" = yes && _toolame=no && _res_comment="disabled by twolame"
if test "$_toolame" = auto ; then
+ _toolame=no
+if test "$_twolame" = yes ; then
+ _res_comment="disabled by twolame"
+else
cat > $TMPC <<EOF
#include <toolame.h>
int main(void) { toolame_init(); return 0; }
EOF
- _toolame=no
cc_check -ltoolame $_ld_lm && _toolame=yes
fi
+fi
if test "$_toolame" = yes ; then
_def_toolame='#define HAVE_TOOLAME 1'
_libs_mencoder="$_libs_mencoder -ltoolame"