X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=f486cde2b59a31809db3981fa50dd693ac0165a6;hb=HEAD;hp=b86a9e9a12d26eeccc18ac1b1754afb34a310b20;hpb=6f80afb428327669fc4c829f804418bdaf039c40;p=melted

diff --git a/configure b/configure
index b86a9e9..f486cde 100755
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-export version=0.3.7
-export soversion=1
+export version=0.3.11
+export soversion=2
 
 show_help()
 {
 	cat << EOF
-Non-autotool config script for MLT.
+Non-autotool config script for Melted.
 
 Help options:
 
@@ -20,7 +20,7 @@ General build options:
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --disable-sse           - Compile without SSE support (default: on)
-  --arch='arch'             - Compile for a specific architecture (default: none)
+  --arch='arch'           - Compile for a specific architecture (default: none)
   --cpu='cpu'             - Compile for a specific CPU (default: none)
 
 Module disables options:
@@ -79,6 +79,7 @@ build_config()
 		echo "SHFLAGS=-shared"
 		echo "LIBDL=-ldl"
 		echo "RDYNAMIC=-rdynamic"
+		echo "LDFLAGS+=-Wl,--as-needed"
 		;;
 		FreeBSD)
 		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
@@ -86,29 +87,24 @@ build_config()
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
 		echo "RDYNAMIC=-rdynamic"
+		echo "LDFLAGS+=-Wl,--as-needed"
 		;;
 		*)
 		;;
 		esac
 		echo "LIBSUF=$LIBSUF"
-	) > config.mak
-
-	echo "#!/bin/sh" > mlt-config
-	(
-		echo export version=$version
-		echo export prefix=$prefix
-		echo export libdir=$libdir
-		echo export bindir=$prefix/bin
-	) >> mlt-config
+		
+		echo "CFLAGS += `pkg-config --cflags mlt-framework`"
+		echo "LDFLAGS += `pkg-config --libs mlt-framework`"
 
-	cat < mlt-config-template >> mlt-config
+	) > config.mak
 
 	echo -n > packages.dat
 }
 
 build_pkgconfig()
 {
-	for i in framework valerie miracle
+	for i in mvcp melted melted++
 	do
 		echo prefix="$prefix" > mlt-$i.pc
 		(
@@ -174,7 +170,7 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
 	case $targetos in
@@ -193,7 +189,7 @@ then
 	esac
 fi
 
-# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
 if [ "$sse" = "true" ]
 then
 	case $targetos in
@@ -225,16 +221,19 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules inigo valerie miracle humperdink
+for i in mvcp melted melted++ mvcp-client modules
 do
-	if [ -x src/$i/configure ]
+	if [ "$gpl" = "true" -o ! -f src/$i/gpl ]
 	then
-		[ $help = 0 ] && echo "Configuring `basename $i`:"
-		olddir=`pwd`
-		cd src/$i
-		./configure "$@"
-		[ $? != 0 ] && exit 1
-		cd $olddir
+		if [ -x src/$i/configure ]
+		then
+			[ $help = 0 ] && echo "Configuring `basename $i`:"
+			olddir=`pwd`
+			cd src/$i
+			./configure "$@"
+			[ $? != 0 ] && exit 1
+			cd $olddir
+		fi
 	fi
 done