[MPlayer-dev-eng] [PATCH] configure: Disable twolame if toolame is enabled

[Carl Eugen Hoyos]

On 2007-01-09 18:05, Dominik 'Rathann' Mierzejewski wrote:

[...]

> Actually it should be the other way around, i.e. twolame should disable 
> toolame, because it's at least maintained, while toolame is not.

New patch attached.

Greetings, Carl Eugen
-------------- next part --------------
Index: configure
===================================================================
--- configure	(Revision 21861)
+++ configure	(Arbeitskopie)
@@ -5615,6 +5615,25 @@
 fi
 echores "$_mad"
 
+echocheck "Twolame"
+if test "$_twolame" = auto ; then
+  cat > $TMPC <<EOF
+#include <twolame.h>
+int main(void) { twolame_init(); return 0; }
+EOF
+  _twolame=no
+  cc_check -ltwolame $_ld_lm && _twolame=yes
+fi
+if test "$_twolame" = yes ; then
+  _def_twolame='#define HAVE_TWOLAME 1'
+  _libs_mencoder="$_libs_mencoder -ltwolame"
+  _codecmodules="twolame $_codecmodules"
+else
+  _def_twolame='#undef HAVE_TWOLAME'
+  _nocodecmodules="twolame $_nocodecmodules"
+fi
+echores "$_twolame"
+
 echocheck "Toolame"
 if test "$_toolame" = auto ; then
   cat > $TMPC <<EOF
@@ -5622,7 +5641,7 @@
 int main(void) { toolame_init(); return 0; }
 EOF
   _toolame=no
-  cc_check -ltoolame $_ld_lm && _toolame=yes
+  cc_check -ltoolame $_ld_lm && _toolame=yes && test "$_twolame" = yes && _res_comment="disabled by twolame" && _toolame=no
 fi
 if test "$_toolame" = yes ; then
   _def_toolame='#define HAVE_TOOLAME 1'
@@ -5637,25 +5656,6 @@
 fi
 echores "$_toolame"
 
-echocheck "Twolame"
-if test "$_twolame" = auto ; then
-  cat > $TMPC <<EOF
-#include <twolame.h>
-int main(void) { twolame_init(); return 0; }
-EOF
-  _twolame=no
-  cc_check -ltwolame $_ld_lm && _twolame=yes
-fi
-if test "$_twolame" = yes ; then
-  _def_twolame='#define HAVE_TWOLAME 1'
-  _libs_mencoder="$_libs_mencoder -ltwolame"
-  _codecmodules="twolame $_codecmodules"
-else
-  _def_twolame='#undef HAVE_TWOLAME'
-  _nocodecmodules="twolame $_nocodecmodules"
-fi
-echores "$_twolame"
-
 echocheck "OggVorbis support"
 if test "$_tremor_internal" = yes; then
   _libvorbis=no