X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=02e9fcb01aad5557b4658708eeaaa84f0eb3c969;hb=57cb56fdf27415a346eb53052907349c179c339a;hp=59508f7d1704130d4d739eb27a8f85f53af1fc42;hpb=eae86b6ff2d11421e4839ffbe79c4c547d15751a;p=melted

diff --git a/configure b/configure
index 59508f7..02e9fcb 100755
--- a/configure
+++ b/configure
@@ -12,7 +12,9 @@ Help options:
 General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
+  --libdir=directory      - lib directory (default: $prefix/lib)
   --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)
@@ -37,7 +39,9 @@ function build_config
 	(
 		echo "version=$version"
 		echo "prefix=$prefix"
+		echo "libdir=$libdir"
 		echo "bindir=$prefix/bin"
+		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
 		echo "MMX_FLAGS=-DUSE_MMX"
@@ -50,16 +54,18 @@ function build_config
 		[ "$cpu" != "" ] &&
 		echo "TARGETARCH=-march=$cpu" &&
 		echo "TARGETCPU=-mcpu=$cpu"
+		echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
 
-		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 "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
 		echo "SHFLAGS=-dynamiclib"
+		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
 		Linux)
+		echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
 		echo "LIBDL=-ldl"
@@ -75,6 +81,7 @@ function build_config
 	(
 		echo export version=$version
 		echo export prefix=$prefix
+		echo export libdir=$libdir
 		echo export bindir=$prefix/bin
 	) >> mlt-config
 
@@ -89,7 +96,7 @@ function build_pkgconfig
 	do
 		echo "prefix=$prefix" >mlt-$i.pc
 		echo "exec_prefix=$prefix" >>mlt-$i.pc
-		echo "libdir=$prefix/lib" >>mlt-$i.pc
+		echo "libdir=$libdir" >>mlt-$i.pc
 		echo "includedir=$prefix/include" >>mlt-$i.pc
 		echo "version=$version" >>mlt-$i.pc
 		echo "cflags=`grep ^$i packages.dat | cut -f 2`" >>mlt-$i.pc
@@ -104,12 +111,14 @@ set +x
 # Define build directory for scripts called
 export build_dir=`dirname $0`
 export prefix=/usr/local
+export libdir=""
 export help=0
-export version=0.1.1
+export version=0.2.1
 export debug=true
 export mmx=true
 export gpl=false
 export cpu=
+export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -117,6 +126,7 @@ targetos=$(uname -s)
 case $targetos in
 	Darwin)
 	LIBSUF=".dylib"
+	mmx=false
 	;;
 	Linux)
 	LIBSUF=".so"
@@ -133,15 +143,35 @@ do
 	case $i in
 		--help )			help=1 ;;
 		--prefix=* )		prefix="${i#--prefix=}" ;;
+		--libdir=* )		libdir="${i#--libdir=}" ;;
 		--disable-debug )	debug=false ;;
 		--disable-mmx )		mmx=false ;;
 		--enable-gpl )		gpl=true ;;
+		--enable-motion-est )	motionest=true ;;
 		--cpu=* )			cpu="${i#--cpu=}" ;;
 	esac
 done
 
+# Determine the libdir if it's not specified in the args
+[ "$libdir" = "" ] && libdir=$prefix/lib
+
+# 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
+if [ $help = 1 ]
+then
+	show_help
+else
+	# Log the configuration history
+	date >> config.log
+	echo "$0 $@" >> config.log
+
+	build_config
+fi
 
 # Iterate through each of the components
 for i in framework modules inigo valerie miracle humperdink
@@ -166,3 +196,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