X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=bdb91dd470089499aff04f24a5ab9b93655c30e0;hb=4dd4b984b46aaf9c1190aa3a4de27817e3e09290;hp=b9edcab45ab7fb4254459323eb8a61912e55a14f;hpb=551e723c3677b73b25209a02c6df564fadbc3f11;p=melted

diff --git a/configure b/configure
index b9edcab..bdb91dd 100755
--- a/configure
+++ b/configure
@@ -1,18 +1,24 @@
-#!/bin/bash
+#!/bin/sh
 
 function show_help
 {
 	cat << EOF
-Funky non-autotool config script for MLT.
+Non-autotool config script for MLT.
 
-Options are:
+Help options:
 
   --help                  - this information
+
+General build options:
+
   --prefix=directory      - install prefix for path (default: $prefix)
+  --enable-gpl            - Enable GPL components
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
-  --enable-gpl            - Enable GPL components
   --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
+
+Module disables options:
+
 EOF
 
 	for i in src/modules/*
@@ -22,6 +28,8 @@ EOF
 	awk '{ printf( "  --disable-%-14.14s- Disable the %s module %s\n", $1, $1, $2 ); }'
 
 	echo
+	echo "  NOTE: libraries marked [GPL] will not be built unless --enable-gpl is stipulated."
+	echo
 }
 
 function build_config
@@ -43,11 +51,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+=-DDARWIN"
+		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
@@ -84,14 +105,31 @@ 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 $*
+for i in "$@"
 do
 	case $i in
 		--help )			help=1 ;;
@@ -103,6 +141,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
 
@@ -112,10 +156,11 @@ do
 	if [ -x src/$i/configure ]
 	then
 		[ $help = 0 ] && echo "Configuring `basename $i`:"
-		pushd src/$i > /dev/null
-		./configure $@
+		olddir=`pwd`
+		cd src/$i
+		./configure "$@"
 		[ $? != 0 ] && exit 1
-		popd > /dev/null
+		cd $olddir
 	fi
 done