From afb1bb1ce5e3a4ce029a12d2f08681c7a57543c3 Mon Sep 17 00:00:00 2001 From: arpi_esp Date: Sun, 25 Feb 2001 18:45:08 +0000 Subject: [PATCH] applied ./configure patch by lgb: support for git-svn-id: svn://svn.mplayerhq.hu/mplayer/trunk@5 b3059339-0415-0410-9bf9-f77b7e298cf2 --- .cvsignore | 2 ++ configure | 54 +++++++++++++++++++++++++++++++++++------------------- 2 files changed, 37 insertions(+), 19 deletions(-) create mode 100644 .cvsignore diff --git a/.cvsignore b/.cvsignore new file mode 100644 index 0000000000..bdbca01bce --- /dev/null +++ b/.cvsignore @@ -0,0 +1,2 @@ +config.h +config.mak diff --git a/configure b/configure index 9e86268bb9..d5dde84b1a 100755 --- a/configure +++ b/configure @@ -4,24 +4,15 @@ # MPlayer configurator. (C) 2000 Pontscho/fresh!mindworkz # pontscho@makacs.poliod.hu # -# some changes by A'rpi/ESP-team: -# - some english bugfix :) -# - removed _??exists flags, _?? is enough... -# - creating only config.mak files instead of whole Makefiles +# Changes in reversed order: # -# some changes by LGB (Gábor Lénárt): -# - SOME gcc may support 'k7', so I added tests for ALL CPU type optimization -# switches with the ability to find out the best optimization for your CPU. -# - Help moved to the begining to avoid tests if user only wants help. -# - A one lined help to indicate detailed help for users -# - Fixed /tmp race (PIDs can be predicted, I added random numbers as well) +# 2000/02/25 by LGB: +# - TMPDIR or TEMPDIR variable is honored during tests for temporary files +# - ChangeLog inside configure was reversed ;-) # # some changes by A'rpi/ESP-team: -# - the --win32libdir patch by Aaron Hope applied -# - some english bugfix again :) -# - cpu type selection changed: -# ( k7->k6->k5-> ) || (i686->pentiumpro-> ) pentium-> i486 -> i386 -> error! -# - cpu type for AMD/family=5 changed k6->k5 +# - added 'athlon' target for the new athlongcc [Ian Kumlien] +# - applied _win32libdir=-L patch by Magnus Pfeffer # # some changes by LGB: # - Ehhh, AMD K6-2 returns with cpuid 5 ;-) Changing back Arpi's last change :) @@ -33,8 +24,23 @@ # - Some useless { ... } are removed # # some changes by A'rpi/ESP-team: -# - added 'athlon' target for the new athlongcc [Ian Kumlien] -# - applied _win32libdir=-L patch by Magnus Pfeffer +# - the --win32libdir patch by Aaron Hope applied +# - some english bugfix again :) +# - cpu type selection changed: +# ( k7->k6->k5-> ) || (i686->pentiumpro-> ) pentium-> i486 -> i386 -> error! +# - cpu type for AMD/family=5 changed k6->k5 +# +# some changes by LGB (Gábor Lénárt): +# - SOME gcc may support 'k7', so I added tests for ALL CPU type optimization +# switches with the ability to find out the best optimization for your CPU. +# - Help moved to the begining to avoid tests if user only wants help. +# - A one lined help to indicate detailed help for users +# - Fixed /tmp race (PIDs can be predicted, I added random numbers as well) +# +# some changes by A'rpi/ESP-team: +# - some english bugfix :) +# - removed _??exists flags, _?? is enough... +# - creating only config.mak files instead of whole Makefiles # # -- @@ -80,9 +86,19 @@ echo "Please wait while ./configure discovers your software and hardware environ # LGB: temporary files -TMPC="/tmp/mplayer-conf-${RANDOM}-$$-${RANDOM}.c" -TMPO="/tmp/mplayer-conf-${RANDOM}-$$-${RANDOM}.o" +TMPC="mplayer-conf-${RANDOM}-$$-${RANDOM}.c" +TMPO="mplayer-conf-${RANDOM}-$$-${RANDOM}.o" +if [ ! -z $TMPDIR ]; then + TMPC="${TMPDIR}/${TMPC}" + TMPO="${TMPDIR}/${TMPO}" +elif [ ! -z $TEMPDIR ]; then + TMPC="${TEMPDIR}/${TMPC}" + TMPO="${TEMPDIR}/${TMPO}" +else + TMPC="/tmp/${TMPC}" + TMPO="/tmp/${TMPO}" +fi # ---