[Mplayer-cvslog] CVS: main configure,1.323,1.324

[pl]

Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv5350

Modified Files:
	configure 
Log Message:
mencoder was still being built (unsucessfully) if mp3lame was missing
added a few comments to config.h


Index: configure
===================================================================
RCS file: /cvsroot/mplayer/main/configure,v
retrieving revision 1.323
retrieving revision 1.324
diff -u -r1.323 -r1.324
--- configure	10 Dec 2001 00:54:50 -0000	1.323
+++ configure	10 Dec 2001 12:07:03 -0000	1.324
@@ -640,7 +640,6 @@
 # If autodetection is available then the third state is: auto
 _libavcodec=auto
 _libavcodecso=no # changed default to no as it causes problems - atmos
-_mp3lame=auto
 _mencoder=auto
 _x11=auto
 _dga=auto	# 1 2 no auto
@@ -2313,46 +2312,44 @@
 fi
 
 
-echocheck "libmp3lame (for mencoder)"
-if test "$_mp3lame" = auto ; then
+# mencoder requires those libs: libmp3lame and divx4linux encore
+if test "$_mencoder" != no ; then
+  _mencoder=no
+
+  echocheck "libmp3lame (required for mencoder)"
+  _mp3lame=no
   cat > $TMPC <<EOF
 #include <lame/lame.h>
 int main(void) { (void) lame_init(); return 0; }
 EOF
-  _mp3lame=no
   # Note: libmp3lame usually depends on vorbis
-  if cc_check -lmp3lame $_ld_vorbis -lm ; then
-    _mp3lame=yes
-  fi
-fi
-if test "$_mp3lame" = yes ; then
+  cc_check -lmp3lame $_ld_vorbis -lm && _mp3lame=yes
+  if test "$_mp3lame" = yes ; then
     _def_mp3lame='#define HAVE_MP3LAME 1'
     _ld_mp3lame="-lmp3lame $_ld_vorbis"
-else
+  else
     _def_mp3lame='#undef HAVE_MP3LAME'
-fi
-echores "$_mp3lame"
-
+  fi
+  echores "$_mp3lame"
 
-echocheck "divx4 encore (for mencoder)"
-#mencoder requires those libs
-if test "$_mencoder" != no ; then
+  echocheck "Divx4linux encore (required for mencoder)"
+  _divx4linux_encore=no
   cat > $TMPC <<EOF
 #include <encore2.h>
 int main(void) { (void) encore(0, 0, 0, 0); return 0; }
 EOF
-  _mencoder=no
   if cc_check -ldivxencore -lm ; then
-    _mencoder=yes 
+    _divx4linux_encore=yes
+    _def_encore='#define NEW_ENCORE 1'
     _ld_encore='-ldivxencore'
+  else
+    _def_encore='#undef NEW_ENCORE'
   fi
+  echores "$_divx4linux_encore"
+
+  test "$_mp3lame" = yes && test "$_divx4linux_encore" = yes && _mencoder=yes
 fi
-if test "$_mencoder" = yes ; then
-  _def_encore='#define NEW_ENCORE 1'
-else
-  _def_encore='#undef NEW_ENCORE'
-fi
-echores "$_mencoder"
+
 
 echocheck "lirc"
 if test "$_lirc" = auto ; then
@@ -2684,7 +2681,8 @@
 #############################################################################
 echo "Creating config.h"
 cat > config.h << EOF
-/* -------- Generated by configure ----------- */
+/* -------- This file has been automatically generated by configure ---------
+   Note: Any changes in it will be lost when you run configure again. */
 
 /* define this to use simple idct with patched libavcodec */
 #define SIMPLE_IDCT 1
@@ -2692,8 +2690,10 @@
 #define USE_OSD 1
 #define USE_SUB 1
 
+/* Toggles debugging informations */
 $_def_debug
 
+/* Indicates is Ogle's libdvdread is available for DVD playback */
 $_def_dvdread
 
 /* Common data directory (for fonts, etc) */
@@ -2706,8 +2706,13 @@
 /* Define for using new DivX4Linux library, instead of open-source OpenDivX */
 /* You have to change DECORE_LIBS in config.mak too! */
 $_def_decore
+
+/* Indicates if Divx4linux encore is available
+   Note: REQUIRED for mencoder */
 $_def_encore
 
+/* Indicates if libmp3lame is available
+   Note: REQUIRED for mencoder */
 $_def_mp3lame
 
 /* Define this to enable avg. byte/sec-based AVI sync method by default: