X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=2b3e755381a60b2726dcf11edaee3876f6d03ac6;hb=c4612a42677dd9c1c781ead06461f2be6178cae8;hp=68e490edcf82261a320969efb90de8d9e1fc52bb;hpb=ef7ca733ee283439a791bfcaea8016bfa3f44a29;p=melted

diff --git a/configure b/configure
index 68e490e..2b3e755 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
-function show_help
+export version=0.3.1
+export soversion=1
+
+show_help()
 {
 	cat << EOF
 Non-autotool config script for MLT.
@@ -12,8 +15,8 @@ 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)
@@ -33,11 +36,13 @@ EOF
 	echo
 }
 
-function build_config
+build_config()
 {
 	(
 		echo "version=$version"
+		echo "soversion=$soversion"
 		echo "prefix=$prefix"
+		echo "libdir=$libdir"
 		echo "bindir=$prefix/bin"
 		echo "targetos=$targetos"
 
@@ -52,8 +57,8 @@ 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
@@ -63,6 +68,7 @@ function build_config
 		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
 		Linux)
+		echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
 		echo "LIBDL=-ldl"
@@ -78,6 +84,7 @@ function build_config
 	(
 		echo export version=$version
 		echo export prefix=$prefix
+		echo export libdir=$libdir
 		echo export bindir=$prefix/bin
 	) >> mlt-config
 
@@ -86,17 +93,19 @@ function build_config
 	echo -n > packages.dat
 }
 
-function build_pkgconfig
+build_pkgconfig()
 {
 	for i in framework valerie miracle
 	do
-		echo "prefix=$prefix" >mlt-$i.pc
-		echo "exec_prefix=$prefix" >>mlt-$i.pc
-		echo "libdir=$prefix/lib" >>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
-		echo "libs=`grep ^$i packages.dat | cut -f 3`" >>mlt-$i.pc
+		echo prefix="$prefix" > mlt-$i.pc
+		(
+			echo exec_prefix=$prefix
+			echo libdir=$libdir
+			echo includedir=$prefix/include
+			echo version=$version
+			echo cflags=`grep ^$i packages.dat | cut -f 2`
+			echo libs=`grep ^$i packages.dat | cut -f 3`
+		) >> mlt-$i.pc
 		cat mlt-$i.pc.in >>mlt-$i.pc
 	done
 }
@@ -107,13 +116,12 @@ 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 debug=true
 export mmx=true
 export gpl=false
 export cpu=
-export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -138,14 +146,17 @@ 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
@@ -153,7 +164,16 @@ then
 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
@@ -177,8 +197,3 @@ build_pkgconfig
 ( [ "$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