Merge ../mlt++

[melted] / configure

diff --git a/configure b/configure
index b633438..72bbfe5 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.3.4
+export version=0.3.9
 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,10 +59,9 @@ 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)"
 
@@ -135,6 +135,7 @@ export debug=true
 export mmx=true
 export sse=true
 export gpl=false
+export arch=
 export cpu=
 export targetos=
 
@@ -165,6 +166,7 @@ do
                --disable-mmx )         mmx=false; sse=false ;;
                --disable-sse )         sse=false ;;
                --enable-gpl )          gpl=true ;;
+               --arch=* )                      arch="${i#--arch=}" ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -172,7 +174,7 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
        case $targetos in
@@ -191,7 +193,7 @@ then
        esac
 fi
 
-# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
 if [ "$sse" = "true" ]
 then
        case $targetos in