intreadwrite.h needs bswap.h if HAVE_FAST_UNALIGNED is set, so include it.

[ffmpeg] / configure

diff --git a/configure b/configure
index d60e31f6cca0170ef3b292a5f4cfcaa33a446c5c..0ecacceadb90614794c1847fbe84607514f5dc5b 100755 (executable)
--- a/configure
+++ b/configure
@@ -398,7 +398,12 @@ check_cpp(){
 check_ld(){
     log check_ld "$@"
     check_cc || return
-    check_cmd $cc $LDFLAGS "$@" -o $TMPE $TMPO $extralibs
+    flags=''
+    libs=''
+    for f; do
+        test "${f}" = "${f#-l}" && flags="$flags $f" || libs="$libs $f"
+    done
+    check_cmd $cc $LDFLAGS $flags -o $TMPE $TMPO $extralibs $libs
 }
 
 check_cflags(){
@@ -1553,7 +1558,7 @@ fi
 
 for thread in $THREADS_LIST; do
     if enabled $thread; then
-        if ! disabled thread_type ; then
+        if test -n "$thread_type"; then
             die "ERROR: Only one thread type must be selected."
         else
             thread_type="$thread"
@@ -1561,6 +1566,13 @@ for thread in $THREADS_LIST; do
     fi
 done
 
+# test for lrintf in math.h
+check_exec <<EOF && lrintf=yes || lrintf=no
+#define _ISOC9X_SOURCE  1
+#include <math.h>
+int main( void ) { return (lrintf(3.999f) > 0)?0:1; }
+EOF
+
 enabled_any libamr_nb libamr_wb && enable libamr
 
 # these are off by default, so fail if requested and not available
@@ -1581,13 +1593,6 @@ enabled libfaac    && require2 libfaac "stdint.h faac.h" faacEncGetVersion -lfaa
 enabled libfaad    && require2 libfaad faad.h faacDecOpen -lfaad
 enabled avisynth   && require2 vfw32 "windows.h vfw.h" AVIFileInit -lvfw32
 
-# test for lrintf in math.h
-check_exec <<EOF && lrintf=yes || lrintf=no
-#define _ISOC9X_SOURCE  1
-#include <math.h>
-int main( void ) { return (lrintf(3.999f) > 0)?0:1; }
-EOF
-
 _restrict=
 for restrict_keyword in restrict __restrict__ __restrict; do
     check_cc <<EOF && _restrict=$restrict_keyword && break
@@ -1785,64 +1790,64 @@ echo "ARCH                      $arch ($cpu)"
 if test "$BUILDSUF" != ""; then
     echo "build suffix              $BUILDSUF"
 fi
-echo "big-endian                $bigendian"
+echo "big-endian                ${bigendian-no}"
 if test $arch = "x86_32" -o $arch = "x86_64"; then
-    echo "MMX enabled               $mmx"
-    echo "CMOV enabled              $cmov"
-    echo "CMOV is fast              $fast_cmov"
+    echo "MMX enabled               ${mmx-no}"
+    echo "CMOV enabled              ${cmov-no}"
+    echo "CMOV is fast              ${fast_cmov-no}"
 fi
 if test $arch = "armv4l"; then
-    echo "ARMv5TE enabled           $armv5te"
-    echo "ARMv6 enabled             $armv6"
-    echo "IWMMXT enabled            $iwmmxt"
+    echo "ARMv5TE enabled           ${armv5te-no}"
+    echo "ARMv6 enabled             ${armv6-no}"
+    echo "IWMMXT enabled            ${iwmmxt-no}"
 fi
 if test $arch = "mips"; then
-    echo "MMI enabled               $mmi"
+    echo "MMI enabled               ${mmi-no}"
 fi
 if test $arch = "powerpc"; then
-    echo "AltiVec enabled           $altivec"
-    echo "dcbzl available           $dcbzl"
+    echo "AltiVec enabled           ${altivec-no}"
+    echo "dcbzl available           ${dcbzl-no}"
 fi
-echo "gprof enabled             $gprof"
-echo "debug symbols             $debug"
-echo "strip symbols             $dostrip"
-echo "optimize                  $optimize"
-echo "static                    $static"
-echo "shared                    $shared"
-echo "postprocessing support    $pp"
-echo "software scaler enabled   $swscaler"
-echo "video hooking             $vhook"
+echo "gprof enabled             ${gprof-no}"
+echo "debug symbols             ${debug-no}"
+echo "strip symbols             ${dostrip-no}"
+echo "optimize                  ${optimize-no}"
+echo "static                    ${static-no}"
+echo "shared                    ${shared-no}"
+echo "postprocessing support    ${pp-no}"
+echo "software scaler enabled   ${swscaler-no}"
+echo "video hooking             ${vhook-no}"
 if enabled vhook; then
-    echo "Imlib2 support            $imlib2"
-    echo "FreeType support          $freetype2"
+    echo "Imlib2 support            ${imlib2-no}"
+    echo "FreeType support          ${freetype2-no}"
 fi
-echo "network support           $network"
+echo "network support           ${network-no}"
 if enabled network; then
-    echo "IPv6 support              $ipv6"
+    echo "IPv6 support              ${ipv6-no}"
 fi
-echo "threading support         $thread_type"
-echo "SDL support               $sdl"
+echo "threading support         ${thread_type-no}"
+echo "SDL support               ${sdl-no}"
 if enabled sdl_too_old; then
     echo "-> Your SDL version is too old - please upgrade to have FFplay/SDL support."
 fi
-echo "Sun medialib support      $mlib"
-echo "AVISynth enabled          $avisynth"
-echo "liba52 support            $liba52"
-echo "liba52 dlopened           $liba52bin"
-echo "libamr-nb support         $libamr_nb"
-echo "libamr-wb support         $libamr_wb"
-echo "libfaac enabled           $libfaac"
-echo "libfaad enabled           $libfaad"
-echo "faadbin enabled           $libfaadbin"
-echo "libgsm enabled            $libgsm"
-echo "libmp3lame enabled        $libmp3lame"
-echo "libnut enabled            $libnut"
-echo "libogg enabled            $libogg"
-echo "libtheora enabled         $libtheora"
-echo "libvorbis enabled         $libvorbis"
-echo "x264 enabled              $libx264"
-echo "XviD enabled              $libxvid"
-echo "zlib enabled              $zlib"
+echo "Sun medialib support      ${mlib-no}"
+echo "AVISynth enabled          ${avisynth-no}"
+echo "liba52 support            ${liba52-no}"
+echo "liba52 dlopened           ${liba52bin-no}"
+echo "libamr-nb support         ${libamr_nb-no}"
+echo "libamr-wb support         ${libamr_wb-no}"
+echo "libfaac enabled           ${libfaac-no}"
+echo "libfaad enabled           ${libfaad-no}"
+echo "faadbin enabled           ${libfaadbin-no}"
+echo "libgsm enabled            ${libgsm-no}"
+echo "libmp3lame enabled        ${libmp3lame-no}"
+echo "libnut enabled            ${libnut-no}"
+echo "libogg enabled            ${libogg-no}"
+echo "libtheora enabled         ${libtheora-no}"
+echo "libvorbis enabled         ${libvorbis-no}"
+echo "x264 enabled              ${libx264-no}"
+echo "XviD enabled              ${libxvid-no}"
+echo "zlib enabled              ${zlib-no}"
 if disabled gpl; then
     echo "License: LGPL"
 else
@@ -2010,7 +2015,6 @@ if enabled source_path_used; then
           libpostproc/Makefile \
           libavutil/Makefile \
           libswscale/Makefile \
-          tests/Makefile \
           vhook/Makefile \
           doc/texi2pod.pl \
           "