[MPlayer-cvslog] CVS: main configure,1.1085,1.1086

[Aurelien Jacobs CVS]

CVS change done by Aurelien Jacobs CVS

Update of /cvsroot/mplayer/main
In directory mail:/var2/tmp/cvs-serv2683

Modified Files:
	configure 
Log Message:
replace mp3lame version detection by required features detection

Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.1085
retrieving revision 1.1086
diff -u -r1.1085 -r1.1086
--- configure	18 Oct 2005 21:37:28 -0000	1.1085
+++ configure	18 Oct 2005 21:40:16 -0000	1.1086
@@ -6181,6 +6181,8 @@
 
   echocheck "libmp3lame (for mencoder)"
   _mp3lame=no
+  _def_mp3lame_preset='#undef HAVE_MP3LAME_PRESET'
+  _def_mp3lame_preset_medium='#undef HAVE_MP3LAME_PRESET_MEDIUM'
   cat > $TMPC <<EOF
 #include <lame/lame.h>
 int main(void) { lame_version_t lv; (void) lame_init(); get_lame_version_numerical(&lv);  printf("%d%d\n",lv.major,lv.minor); return 0; }
@@ -6188,12 +6190,20 @@
   # Note: libmp3lame usually depends on vorbis
   cc_check -lmp3lame $_ld_vorbis $_ld_lm && "$TMPO" >> "$TMPLOG" 2>&1 && _mp3lame=yes
   if test "$_mp3lame" = yes ; then
-    _def_mp3lame="#define HAVE_MP3LAME `$TMPO`"
-    _def_cfg_mp3lame="#define CONFIG_MP3LAME `$TMPO`"
+    _def_mp3lame="#define HAVE_MP3LAME"
     _ld_mp3lame="-lmp3lame $_ld_vorbis"
+    cat > $TMPC << EOF
+#include <lame/lame.h>
+int main(void) { int p = STANDARD_FAST; return 0; }
+EOF
+    cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset="#define HAVE_MP3LAME_PRESET"
+    cat > $TMPC << EOF
+#include <lame/lame.h>
+int main(void) { int p = MEDIUM_FAST; return 0; }
+EOF
+    cc_check $_ld_mp3lame $_ld_lm && _def_mp3lame_preset_medium="#define HAVE_MP3LAME_PRESET_MEDIUM"
   else
     _def_mp3lame='#undef HAVE_MP3LAME'
-    _def_cfg_mp3lame='#undef CONFIG_MP3LAME'
   fi
   echores "$_mp3lame"
 
@@ -7184,7 +7194,8 @@
 /* Indicates if libmp3lame is available
    Note: for mencoder */
 $_def_mp3lame
-$_def_cfg_mp3lame
+$_def_mp3lame_preset
+$_def_mp3lame_preset_medium
 
 /* Define libmp1e for realtime mpeg encoding (for DXR3 and DVB cards) */
 $_def_mp1e