X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=bdb91dd470089499aff04f24a5ab9b93655c30e0;hb=3e4dcedca1782fce40cffc4cedb74d0cddef2c8f;hp=a9574c39f23be30d899fff8de9411fe4f31ad1fd;hpb=a4799884f16e60db669cdf7ce6e15f160e3c7613;p=mlt

diff --git a/configure b/configure
index a9574c39..bdb91dd4 100755
--- a/configure
+++ b/configure
@@ -1,26 +1,35 @@
-#!/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)
+  --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
@@ -39,11 +48,27 @@ function build_config
 		echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
 		[ "$cpu" != "" ] &&
-		echo "TARGET_ARCH=-march=$cpu" &&
-		echo "TARGET_CPU=-mcpu=$cpu"
-
-		echo "OPTIMISATIONS=-O4 \$(TARGET_ARCH) \$(TARGET_CPU) -pipe -ffast-math -fomit-frame-pointer"
-		echo "CFLAGS=-Wall \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
+		echo "TARGETARCH=-march=$cpu" &&
+		echo "TARGETCPU=-mcpu=$cpu"
+
+		echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
+		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
@@ -80,23 +105,48 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export help=0
-export version=0.1.0
+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 ;;
 		--prefix=* )		prefix="${i#--prefix=}" ;;
 		--disable-debug )	debug=false ;;
 		--disable-mmx )		mmx=false ;;
+		--enable-gpl )		gpl=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
 
@@ -105,13 +155,21 @@ for i in framework modules inigo valerie miracle humperdink
 do
 	if [ -x src/$i/configure ]
 	then
-		echo "Configuring `basename $i`:"
-		pushd src/$i > /dev/null
-		./configure $@
+		[ $help = 0 ] && echo "Configuring `basename $i`:"
+		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" )
+