[Mplayer-cvslog] CVS: main configure2,1.257,1.258

[pl]

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

Modified Files:
	configure2 
Log Message:
zlib seems is required for mov demuxer => changed tests
(HAVE_ZLIB no longer needed since zlib presence mandatory)
configure.log is no longer in /tmp/
"Creating Gui/config.mak" added


Index: configure2
===================================================================
RCS file: /cvsroot/mplayer/main/configure2,v
retrieving revision 1.257
retrieving revision 1.258
diff -u -r1.257 -r1.258
--- configure2	18 Nov 2001 17:45:23 -0000	1.257
+++ configure2	18 Nov 2001 20:54:08 -0000	1.258
@@ -7,7 +7,6 @@
 #
 # Cleanups all over the place (c) 2001 pl
 #
-#
 # Guidelines:
 # If the option is named 'opt':
 #   _opt : should have a value in yes/no/auto
@@ -19,7 +18,6 @@
 #  - config files are currently:
 #    config.h config.mak libvo/config.mak libao2/config.mak
 #    Gui/config.mak libvo2/config.mak
-#  - removed xmmp/esd
 #  - removed dvbincdir/madincdir/cssincdir: add them to extraincdir
 #
 #############################################################################
@@ -259,7 +257,8 @@
   test "$I" && break
 done
 
-TMPLOG="$I/configure-$RANDOM-$$.log"
+TMPLOG="configure.log"
+rm -f "$TMPLOG"
 TMPC="$I/mplayer-conf-$RANDOM-$$.c"
 TMPCPP="$I/mplayer-conf-$RANDOM-$$.cpp"
 TMPO="$I/mplayer-conf-$RANDOM-$$.o"
@@ -1074,6 +1073,19 @@
 echores "using $_ld_pthread"
 
 
+echocheck "zlib"
+cat > $TMPC << EOF
+#include <zlib.h>
+int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; }
+EOF
+if cc_check -lz ; then 
+  _ld_zlib='-lz'
+else
+  die "Lib zlib not found"
+fi
+echores "using $_ld_zlib"
+
+
 echocheck "sys/soundcard.h"
 cat > $TMPC << EOF
 #include <sys/soundcard.h>
@@ -1520,7 +1532,7 @@
     # incompatible with the GNU libpng
     echores "disabled on irix (not GNU libpng)"
   else
-    cc_check  -lpng -lz -lm && _png=yes
+    cc_check  -lpng $_ld_zlib -lm && _png=yes
     echores yes
   fi
 else
@@ -1528,7 +1540,7 @@
 fi
 if test "$_png" = yes ; then
   _def_png='#define HAVE_PNG 1'
-  _ld_png='-lpng -lz'
+  _ld_png='-lpng'
   _vosrc="$_vosrc vo_png.c"
 else
   _def_png='#undef HAVE_PNG'
@@ -1765,22 +1777,6 @@
 fi
 
 
-echocheck "zlib"
-cat > $TMPC << EOF
-#include <zlib.h>
-int main(void) { return 0; }
-EOF
-_zlib=no
-cc_check -lz && _zlib=yes
-if test "$_zlib" = yes ; then
-  _def_zlib='#define HAVE_ZLIB 1'
-  _ld_zlib='-lz'
-else
-  _def_zlib='#undef HAVE_ZLIB'
-fi
-echores "$_zlib"
-
-
 echocheck "mad support"
 if test "$_mad" = auto ; then
   _mad=no
@@ -2098,7 +2094,6 @@
 
 
 # --------------- GUI specific tests begin -------------------
-echo
 echocheck "GUI"
 echo "$_gui"
 if test "$_gui" = yes ; then
@@ -2171,6 +2166,8 @@
   _def_gui='#define HAVE_NEW_GUI 1'
   _ld_gui='-LGui -lgui $(GTKLIB) $(GLIBLIB)'
 
+  echo
+  echo "Creating Gui/config.mak"
   cat > Gui/config.mak << EOF
 # -------- Generated by configure -----------
 
@@ -2236,7 +2233,7 @@
   _confcygwin="TARGET_CYGWIN = no"
 fi
 
-_ld_arch="$_ld_pthread $_ld_dl"
+_ld_arch="$_ld_pthread $_ld_dl $_ld_zlib"
 bsd && _ld_arch="-rdynamic $_ld_arch"
 bsdos && _ld_arch="$_ld_arch -ldvd"
 
@@ -2398,9 +2395,6 @@
 
 /* Define this if you have the kstat kernel statistics library */
 $_def_kstat
-
-/* Define this if you have zlib */
-$_def_zlib
 
 /* Define this if your system has vsscanf */
 $_def_vsscanf