Mercurial > mplayer.hg

changeset 21909:d46c88125495

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Move toolame vs twolame logic into the $_toolame=auto case.
author diego
date Sun, 14 Jan 2007 22:58:25 +0000
parents 22782c86fd38
children 36a474903e8a
files configure
diffstat 1 files changed, 5 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/configure	Sun Jan 14 22:45:45 2007 +0000
+++ b/configure	Sun Jan 14 22:58:25 2007 +0000
@@ -5659,15 +5659,18 @@
 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"