From 0f53b192285264aacd2128366bd42b2c6fff7349 Mon Sep 17 00:00:00 2001 From: Diego Biurrun Date: Tue, 25 Mar 2008 09:22:03 +0000 Subject: 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 --- configure | 31 ++++++++++++++++--------------- 1 file changed, 16 insertions(+), 15 deletions(-) (limited to 'configure') diff --git a/configure b/configure index 45e5b6d7d8..86f9df5931 100755 --- a/configure +++ b/configure @@ -863,21 +863,6 @@ ffserver_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 enable logging @@ -1303,6 +1288,22 @@ case $targetos in ;; 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 if ! disabled logging ; then -- cgit v1.2.3