diff options
| author | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-18 21:36:30 +0000 |
|---|---|---|
| committer | pl <pl@b3059339-0415-0410-9bf9-f77b7e298cf2> | 2001-11-18 21:36:30 +0000 |
| commit | cf79443140518cdac050368c6c6b611f4cf2ad50 (patch) | |
| tree | 810ff0d2856c3698cb1adf8b120b1270f1c981f0 /configure | |
| parent | 92b3c286f9b679975c09627dfa59502eafff8ff7 (diff) | |
| download | mpv-cf79443140518cdac050368c6c6b611f4cf2ad50.tar.bz2 mpv-cf79443140518cdac050368c6c6b611f4cf2ad50.tar.xz | |
configure.log is no longer in /tmp/
"Creating Gui/config.mak" added
changed zlib compile test
(more general zlib fix still underway)
git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@2984 b3059339-0415-0410-9bf9-f77b7e298cf2
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 9 |
1 files changed, 5 insertions, 4 deletions
@@ -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 ----------- |