[Mplayer-cvslog] CVS: main configure2,1.257,1.258
pl
pl at mplayer.dev.hu
Sun Nov 18 22:36:32 CET 2001
Update of /cvsroot/mplayer/main
In directory mplayer:/var/tmp.root/cvs-serv12442
Modified Files:
configure2
Log Message:
configure.log is no longer in /tmp/
"Creating Gui/config.mak" added
changed zlib compile test
(more general zlib fix still underway)
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 21:36:30 -0000 1.258
@@ -19,7 +19,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 +258,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"
@@ -1768,7 +1768,7 @@
echocheck "zlib"
cat > $TMPC << EOF
#include <zlib.h>
-int main(void) { return 0; }
+int main(void) { (void) inflate(0, Z_NO_FLUSH); return 0; }
EOF
_zlib=no
cc_check -lz && _zlib=yes
@@ -2098,7 +2098,6 @@
# --------------- GUI specific tests begin -------------------
-echo
echocheck "GUI"
echo "$_gui"
if test "$_gui" = yes ; then
@@ -2171,6 +2170,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 -----------
More information about the MPlayer-cvslog
mailing list