producer_avformat.c: fix build on older versions of ffmpeg; whitespace cleanup

[mlt] / configure

diff --git a/configure b/configure
index dce184f6e2041fd74844f92cf194e656517e7d8d..9892dcdfafd68400332f094a9838964fd70d004b 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.3.3
+export version=0.3.5
 export soversion=1
 
 show_help()
@@ -67,11 +67,13 @@ build_config()
 
                case $targetos in
                Darwin)
+               sysctl -a hw | grep "x86_64: 1" > /dev/null && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
                echo "SHFLAGS=-dynamiclib"
                echo "LDFLAGS+=`sdl-config --libs`"
                ;;
                Linux)
+               [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
@@ -79,6 +81,7 @@ build_config()
                echo "RDYNAMIC=-rdynamic"
                ;;
                FreeBSD)
+               [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
@@ -159,7 +162,7 @@ do
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --libdir=* )            libdir="${i#--libdir=}" ;;
                --disable-debug )       debug=false ;;
-               --disable-mmx )         mmx=false ;;
+               --disable-mmx )         mmx=false; sse=false ;;
                --disable-sse )         sse=false ;;
                --enable-gpl )          gpl=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
@@ -174,7 +177,7 @@ if [ "$mmx" = "true" ]
 then
        case $targetos in
                Darwin)
-               sysctl -a hw | grep mmx: > /dev/null | mmx=false
+               sysctl -a hw | grep "mmx: 1" > /dev/null || mmx=false
                ;;
                Linux)
                grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
@@ -193,7 +196,7 @@ if [ "$sse" = "true" ]
 then
        case $targetos in
                Darwin)
-               sysctl -a hw | grep sse: > /dev/null | sse=false
+               sysctl -a hw | grep "sse: 1" > /dev/null || sse=false
                ;;
                Linux)
                grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false