+ Alpha handling in silly filter :-)

[mlt] / configure

diff --git a/configure b/configure
index 0dc352f29ab8c296468747b4beefbde40e5afc7a..cfa00fb0ec6d75c3737c56cf6dad83caf69ebe58 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function show_help
 {
@@ -13,6 +13,7 @@ General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
   --enable-gpl            - Enable GPL components
+  --enable-motion-est    - Enable motion estimation components
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
@@ -38,6 +39,7 @@ function build_config
                echo "version=$version"
                echo "prefix=$prefix"
                echo "bindir=$prefix/bin"
+               echo "targetos=$targetos"
 
                [ "$mmx" = "true" ] && 
                echo "MMX_FLAGS=-DUSE_MMX"
@@ -51,11 +53,24 @@ function build_config
                echo "TARGETARCH=-march=$cpu" &&
                echo "TARGETCPU=-mcpu=$cpu"
 
-               [ "`uname`" = "Linux" ] &&
-               echo "LIBDL=-ldl"
-
                echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
-               echo "CFLAGS+=-Wall \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
+               echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+
+               case $targetos in
+               Darwin)
+               echo "CFLAGS+=-D__DARWIN__"
+               echo "SHFLAGS=-dynamiclib"
+               ;;
+               Linux)
+               echo "CFLAGS+=-pthread"
+               echo "SHFLAGS=-shared"
+               echo "LIBDL=-ldl"
+               echo "RDYNAMIC=-rdynamic"
+               ;;
+               *)
+               ;;
+               esac
+               echo "LIBSUF=$LIBSUF"
        ) > config.mak
 
        echo "#!/bin/sh" > mlt-config
@@ -92,11 +107,29 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export help=0
-export version=0.0.3
+export version=0.1.1
 export debug=true
 export mmx=true
 export gpl=false
 export cpu=
+export motionest=false
+
+# Determine OS
+targetos=$(uname -s)
+# Chose appropriate suffix for libraries
+case $targetos in
+       Darwin)
+       LIBSUF=".dylib"
+       mmx=false
+       ;;
+       Linux)
+       LIBSUF=".so"
+       ;;
+       *)
+       LIBSUF=".so"
+       ;;
+esac
+export LIBSUF
 
 # Iterate through arguments
 for i in "$@"
@@ -107,10 +140,17 @@ do
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
                --enable-gpl )          gpl=true ;;
+               --enable-motion-est )   motionest=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
 
+# Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
+if [ "$mmx" = "true" ]
+then
+       grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+fi
+
 # Show help if requested
 [ $help = 1 ] && show_help || build_config
 
@@ -120,10 +160,11 @@ do
        if [ -x src/$i/configure ]
        then
                [ $help = 0 ] && echo "Configuring `basename $i`:"
-               pushd src/$i > /dev/null
+               olddir=`pwd`
+               cd src/$i
                ./configure "$@"
                [ $? != 0 ] && exit 1
-               popd > /dev/null
+               cd $olddir
        fi
 done
 
@@ -136,3 +177,7 @@ build_pkgconfig
 echo "GPL Components are disabled" || 
 echo "GPL License Used" )
 
+if [ "$motionest" = "true" -a "$gpl" = "false" ]
+then
+       echo "Add the --enable-gpl flag to build the motion estimation components."
+fi