Merge branch 'review-1' of git://github.com/rayl/mlt

[melted] / configure

diff --git a/configure b/configure
index dce184f..b86a9e9 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.3.3
+export version=0.3.7
 export soversion=1
 
 show_help()
@@ -20,7 +20,8 @@ General build options:
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --disable-sse           - Compile without SSE support (default: on)
-  --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
+  --arch='arch'             - Compile for a specific architecture (default: none)
+  --cpu='cpu'             - Compile for a specific CPU (default: none)
 
 Module disables options:
 
@@ -58,20 +59,21 @@ build_config()
 
                echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
-               [ "$cpu" != "" ] &&
-               echo "TARGETARCH=-march=$cpu" &&
-               echo "TARGETCPU=-mcpu=$cpu"
-               echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer"
+               [ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
+               [ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
+               echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
                echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
                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"
@@ -132,6 +135,7 @@ export debug=true
 export mmx=true
 export sse=true
 export gpl=false
+export arch=
 export cpu=
 export targetos=
 
@@ -159,9 +163,10 @@ 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 ;;
+               --arch=* )                      arch="${i#--arch=}" ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -174,7 +179,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 +198,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