X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=mlt%2B%2B%2Fconfigure;h=8b099b37fa5aa5de75f5c831bf7d052d4909c02b;hb=2e52de54cf0de8e2767e48dc0504cd0eb59281ec;hp=8c02c9890e775f4f21c8af6c2ca69c400ec56bc0;hpb=7c8efa096472fc2d30e4d07ca63ddfe380f964ab;p=melted

diff --git a/mlt++/configure b/mlt++/configure
index 8c02c98..8b099b3 100755
--- a/mlt++/configure
+++ b/mlt++/configure
@@ -1,32 +1,52 @@
 #!/bin/sh
 
-path=`which mlt-config 2>/dev/null`
+pkg-config mlt-framework 2>/dev/null
 [ $? != 0 ] && echo "MLT not installed - aborting" && exit 1 
 
 # Determine default prefix
-prefix=`mlt-config --prefix`
+prefix=`pkg-config --variable=prefix mlt-framework`
 [ "$prefix" = "" ] && echo "Can't locate MLT's prefix - please reconfigure MLT." && exit 1
 
+# Default the libdir
+libdir=""
+
 # Allow override from command line
-[ "$1" != "" ] && prefix="${1#--prefix=}"
+for i in "$@"
+do
+	case $i in
+		--prefix=* ) prefix="${i#--prefix=}" ;;
+		--libdir=* ) libdir="${i#--libdir=}" ;;
+	esac
+done
+
+# Determine the libdir if it's not specified in the args
+[ "$libdir" = "" ] && libdir=$prefix/lib
 
 # Sanity check
 [ ! -d "$prefix" ] && echo "Invalid prefix $prefix - aborting" && exit 1
 
-echo "prefix=$prefix" > config.mak
+echo "version=`pkg-config --modversion mlt-framework`" > config.mak
+echo "soversion=1" >> config.mak
+echo "prefix=$prefix" >> config.mak
+echo "libdir=$libdir" >> config.mak
 
 targetos=$(uname -s)
+echo "targetos=$targetos" >> config.mak
+
+WARNINGS="-W -Wwrite-strings -Wcast-qual -Wpointer-arith -Wcast-align -Wredundant-decls"
 
 case $targetos in 
 	Darwin)
 		echo LIBSUF=.dylib
-        echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `mlt-config --cflags`"
-        echo "LDFLAGS=-dynamiclib `mlt-config --libs` `mlt-config miracle --libs` `mlt-config valerie --libs` -single_module"
+		echo "CXXFLAGS+=-D__DARWIN__ -Wall -fPIC `pkg-config --cflags mlt-framework`"
+		echo "LIBFLAGS=-dynamiclib -single_module"
+		echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs` `pkg-config mlt-valerie --libs`"
 		;;
-	Linux)
+	Linux|FreeBSD)
 		echo LIBSUF=.so
-        echo "CXXFLAGS+=-pthread -Wall -fPIC `mlt-config --cflags`"
-        echo "LDFLAGS=-shared `mlt-config --libs` `mlt-config miracle --libs`"
+		echo "CXXFLAGS+=-pthread -Wall $WARNINGS -fPIC `pkg-config --cflags mlt-framework`"
+		echo "LIBFLAGS=-shared"
+		echo "LDFLAGS+=`pkg-config --libs mlt-framework` `pkg-config mlt-miracle --libs`"
 		;;
 esac >> config.mak