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

diff --git a/configure b/configure
index 073f858..9808ff3 100755
--- a/configure
+++ b/configure
@@ -1,26 +1,36 @@
-#!/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
+  --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)
+
+Module disables options:
 
-	--help                  - this information
-	--prefix=directory      - install prefix for path (default: $prefix)
-	--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)
 EOF
 
 	for i in src/modules/*
 	do
-		[ -d $i ] && [ "`basename $i`" != "CVS" ] && basename $i
+		[ -d $i ] && [ "`basename $i`" != "CVS" ] && echo `basename $i` `[ -f $i/gpl ] && echo [GPL]`
 	done |
-	awk '{ printf( "   --disable-%-14.14s- Disable the %s module\n", $1, $1 ); }'
+	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
@@ -29,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"
@@ -42,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 \$(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
@@ -83,23 +108,50 @@ 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 $*
+for i in "$@"
 do
 	case $i in
 		--help )			help=1 ;;
 		--prefix=* )		prefix="${i#--prefix=}" ;;
 		--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
 
@@ -109,12 +161,24 @@ 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
 
 # Build the pkg-config files
 build_pkgconfig
+
+# Report GPL Usage
+[ $help != 1 ] && 
+( [ "$gpl" = "false" ] && 
+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