gwj / at91sam9263 · Commits

Commit d4742de84fe0b5907a46b1a32b5646f1d64e001a

Authored by malc
1 parent 9ac81bbb

Handle SDL log just like other temporary files 

git-svn-id: svn://svn.savannah.nongnu.org/qemu/trunk@5817 c046a42c-6fe2-441c-8c8c-71466251a162
Inline Side-by-side
Showing 1 changed file with 5 additions and 5 deletions
configure
  View file @d4742de
@@ -16,8 +16,9 @@ TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o" @@ -16,8 +16,9 @@ TMPO="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.o"
16 TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}" 16 TMPE="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}"
17 TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S" 17 TMPS="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.S"
18 TMPI="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.i" 18 TMPI="${TMPDIR1}/qemu-conf-${RANDOM}-$$-${RANDOM}.i"
  19 +TMPSDLLOG="${TMPDIR1}/qemu-conf-sdl-$$-${RANDOM}.log"
19 20
20 -trap "rm -f $TMPC $TMPO $TMPE $TMPS $TMPI; exit" 0 2 3 15 21 +trap "rm -f $TMPC $TMPO $TMPE $TMPS $TMPI $TMPSDLLOG; exit" 0 2 3 15
21 22
22 # default parameters 23 # default parameters
23 prefix="" 24 prefix=""
@@ -791,7 +792,7 @@ cat > $TMPC << EOF @@ -791,7 +792,7 @@ cat > $TMPC << EOF
791 #undef main /* We don't want SDL to override our main() */ 792 #undef main /* We don't want SDL to override our main() */
792 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); } 793 int main( void ) { return SDL_Init (SDL_INIT_VIDEO); }
793 EOF 794 EOF
794 - if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> /tmp/qemu-$$-sdl-config.log ; then 795 + if $cc $ARCH_CFLAGS -o $TMPE ${OS_CFLAGS} `$sdl_config --cflags 2> /dev/null` $TMPC `$sdl_config --libs 2> /dev/null` 2> $TMPSDLLOG ; then
795 _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'` 796 _sdlversion=`$sdl_config --version | sed 's/[^0-9]//g'`
796 if test "$_sdlversion" -lt 121 ; then 797 if test "$_sdlversion" -lt 121 ; then
797 sdl_too_old=yes 798 sdl_too_old=yes
@@ -1095,11 +1096,10 @@ echo "KVM support $kvm" @@ -1095,11 +1096,10 @@ echo "KVM support $kvm"
1095 if test $sdl_too_old = "yes"; then 1096 if test $sdl_too_old = "yes"; then
1096 echo "-> Your SDL version is too old - please upgrade to have SDL support" 1097 echo "-> Your SDL version is too old - please upgrade to have SDL support"
1097 fi 1098 fi
1098 -if [ -s /tmp/qemu-$$-sdl-config.log ]; then 1099 +if [ -s $TMPSDLLOG ]; then
1099 echo "The error log from compiling the libSDL test is: " 1100 echo "The error log from compiling the libSDL test is: "
1100 - cat /tmp/qemu-$$-sdl-config.log 1101 + cat $TMPSDLLOG
1101 fi 1102 fi
1102 -rm -f /tmp/qemu-$$-sdl-config.log  
1103 #if test "$sdl_static" = "no"; then 1103 #if test "$sdl_static" = "no"; then
1104 # echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output" 1104 # echo "WARNING: cannot compile statically with SDL - qemu-fast won't have a graphical output"
1105 #fi 1105 #fi