summaryrefslogtreecommitdiff
path: root/configure
diff options
context:
space:
mode:
authorDiego Biurrun <diego@biurrun.de>2008-03-31 14:05:58 +0000
committerDiego Biurrun <diego@biurrun.de>2008-03-31 14:05:58 +0000
commitedd08265fc241c3ba48a2e2bea5b1b160cf3e35f (patch)
tree614b255277409375f183acfdf69e4fed4566e9b6 /configure
parent4fd51ee39a6a882dca7305d45e1d98f8065fe2f2 (diff)
Use a different filename that ends in .sh for temporary shell scripts.
Apparently some Windows command interpreters have trouble executing shell scripts with an .exe suffix. inspired by a patch from Axel Holzinger, aholzinger gmx de Originally committed as revision 12650 to svn://svn.ffmpeg.org/ffmpeg/trunk
Diffstat (limited to 'configure')
-rwxr-xr-xconfigure13
1 files changed, 7 insertions, 6 deletions
diff --git a/configure b/configure
index 0409a418b6..bc8b18fc60 100755
--- a/configure
+++ b/configure
@@ -216,7 +216,7 @@ Include the log file "$logfile" produced by configure as this will help
solving the problem.
EOF
fi
- rm -f $TMPC $TMPO $TMPE $TMPS $TMPH
+ rm -f $TMPC $TMPO $TMPE $TMPS $TMPH $TMPSH
exit 1
}
@@ -1210,6 +1210,7 @@ TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}${EXESUF}"
TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
+TMPSH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.sh"
add_extralibs $osextralibs
@@ -1442,11 +1443,11 @@ if ! gnu_make $make; then
fi
# make sure we can execute files in $TMPDIR
-cat >$TMPE 2>>$logfile <<EOF
+cat >$TMPSH 2>>$logfile <<EOF
#! /bin/sh
EOF
-chmod +x $TMPE >>$logfile 2>&1
-if ! $TMPE >>$logfile 2>&1; then
+chmod +x $TMPSH >>$logfile 2>&1
+if ! $TMPSH >>$logfile 2>&1; then
cat <<EOF
Unable to create and execute files in $TMPDIR1. Set the TMPDIR environment
variable to another directory and make sure that $TMPDIR1 is not mounted
@@ -1454,7 +1455,7 @@ noexec.
EOF
die "Sanity test failed."
fi
-rm $TMPE
+rm $TMPSH
# compiler sanity check
check_exec <<EOF
@@ -2067,7 +2068,7 @@ cmp -s $TMPH config.h &&
echo "config.h is unchanged" ||
mv -f $TMPH config.h
-rm -f $TMPO $TMPC $TMPE $TMPS $TMPH
+rm -f $TMPO $TMPC $TMPE $TMPS $TMPH $TMPSH
# build tree in object directory if source path is different from current one
if enabled source_path_used; then