X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=2e2f2bedfc6b81bdec69f1f29a3ba84eea6639c3;hb=131742158e74a4e60f21c567fa0b63f165730377;hp=0dc352f29ab8c296468747b4beefbde40e5afc7a;hpb=757e8d55530954c3002b71f78d5027a222e810f7;p=melted

diff --git a/configure b/configure
index 0dc352f..2e2f2be 100755
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function show_help
 {
@@ -38,6 +38,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 +52,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,12 +106,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=
 
+# 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 "$@"
 do
@@ -111,6 +142,12 @@ do
 	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 +157,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