summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure b/configure
index 3f734bab4d..d6243f83a6 100755
--- a/configure
+++ b/configure
@@ -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 @@ for I in "$TMPDIR" "$TEMPDIR" "/tmp" ; do
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 @@ fi
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 @@ echores "$_streaming"
# --------------- GUI specific tests begin -------------------
-echo
echocheck "GUI"
echo "$_gui"
if test "$_gui" = yes ; then
@@ -2171,6 +2170,8 @@ EOF
_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 -----------