X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=9808ff3d424ff372e3a97ee666c787bf910832da;hb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;hp=e1985812fc363b90a3c622d7a1f3da0e1eb4b300;hpb=4dbf3ebb9b3642a02300bd2388c6b2211160cb5a;p=melted

diff --git a/configure b/configure
index e198581..9808ff3 100755
--- a/configure
+++ b/configure
@@ -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,25 @@ 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 -fPIC -DPIC \$(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__ `sdl-config --cflags`"
+		echo "SHFLAGS=-dynamiclib"
+		echo "LIBDL=`sdl-config --libs`"
+		;;
+		Linux)
+		echo "CFLAGS+=-pthread"
+		echo "SHFLAGS=-shared"
+		echo "LIBDL=-ldl"
+		echo "RDYNAMIC=-rdynamic"
+		;;
+		*)
+		;;
+		esac
+		echo "LIBSUF=$LIBSUF"
 	) > config.mak
 
 	echo "#!/bin/sh" > mlt-config
@@ -97,6 +113,24 @@ 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 +141,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
 
@@ -137,3 +178,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