[MPlayer-cvslog] r21927 - trunk/configure

[diego]

Author: diego
Date: Sun Jan 14 23:58:25 2007
New Revision: 21927

Modified:
   trunk/configure

Log:
Move toolame vs twolame logic into the $_toolame=auto case.


Modified: trunk/configure
==============================================================================
--- trunk/configure	(original)
+++ trunk/configure	Sun Jan 14 23:58:25 2007
@@ -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"