From 811cec046e8c70ae5ba94428075b010ed2877e4b Mon Sep 17 00:00:00 2001 From: diego Date: Sun, 14 Jan 2007 22:35:10 +0000 Subject: [PATCH] Move twolame check before toolame check. git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@21924 b3059339-0415-0410-9bf9-f77b7e298cf2 --- configure | 38 +++++++++++++++++++------------------- 1 file changed, 19 insertions(+), 19 deletions(-) diff --git a/configure b/configure index 3fab35da38..ed30fc6ca8 100755 --- a/configure +++ b/configure @@ -5639,6 +5639,25 @@ else fi echores "$_mad" +echocheck "Twolame" +if test "$_twolame" = auto ; then + cat > $TMPC < +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 < $TMPC < -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