Move declaration of temporary filenames after the OS-specific settings
so that things like executable suffix can be picked up. Originally committed as revision 12573 to svn://svn.ffmpeg.org/ffmpeg/trunk
This commit is contained in:
31
configure
vendored
31
configure
vendored
@@ -863,21 +863,6 @@ ffserver_extralibs='$ldl'
|
|||||||
vhook_extralibs='$ldl'
|
vhook_extralibs='$ldl'
|
||||||
|
|
||||||
|
|
||||||
# set temporary file name
|
|
||||||
if test ! -z "$TMPDIR" ; then
|
|
||||||
TMPDIR1="${TMPDIR}"
|
|
||||||
elif test ! -z "$TEMPDIR" ; then
|
|
||||||
TMPDIR1="${TEMPDIR}"
|
|
||||||
else
|
|
||||||
TMPDIR1="/tmp"
|
|
||||||
fi
|
|
||||||
|
|
||||||
TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
|
|
||||||
TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
|
|
||||||
TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}"
|
|
||||||
TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
|
|
||||||
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
|
|
||||||
|
|
||||||
# default parameters
|
# default parameters
|
||||||
|
|
||||||
enable logging
|
enable logging
|
||||||
@@ -1303,6 +1288,22 @@ case $targetos in
|
|||||||
;;
|
;;
|
||||||
esac
|
esac
|
||||||
|
|
||||||
|
# set temporary file name
|
||||||
|
if test ! -z "$TMPDIR" ; then
|
||||||
|
TMPDIR1="${TMPDIR}"
|
||||||
|
elif test ! -z "$TEMPDIR" ; then
|
||||||
|
TMPDIR1="${TEMPDIR}"
|
||||||
|
else
|
||||||
|
TMPDIR1="/tmp"
|
||||||
|
fi
|
||||||
|
|
||||||
|
TMPC="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.c"
|
||||||
|
TMPO="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.o"
|
||||||
|
TMPE="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}"
|
||||||
|
TMPS="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.S"
|
||||||
|
TMPH="${TMPDIR1}/ffmpeg-conf-${RANDOM}-$$-${RANDOM}.h"
|
||||||
|
|
||||||
|
|
||||||
add_extralibs $osextralibs
|
add_extralibs $osextralibs
|
||||||
|
|
||||||
if ! disabled logging ; then
|
if ! disabled logging ; then
|
||||||
|
Reference in New Issue
Block a user