Mercurial > mplayer.hg
changeset 2983:ebf80361ec88
configure.log is no longer in /tmp/
"Creating Gui/config.mak" added
changed zlib compile test
(more general zlib fix still underway)
| author | pl |
|---|---|
| date | Sun, 18 Nov 2001 21:36:30 +0000 |
| parents | 32638add0dc8 |
| children | 5bafe535b62f |
| files | configure |
| diffstat | 1 files changed, 5 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/configure Sun Nov 18 19:47:58 2001 +0000 +++ b/configure Sun Nov 18 21:36:30 2001 +0000 @@ -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 -----------