X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=9eb329bd8732ecc47a8ccd8b389a5c6495fd9226;hb=458ca7a54231f7115beafcd26b7c301c6ba2717c;hp=2b3e755381a60b2726dcf11edaee3876f6d03ac6;hpb=c4612a42677dd9c1c781ead06461f2be6178cae8;p=mlt

diff --git a/configure b/configure
index 2b3e7553..9eb329bd 100755
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
-#!/bin/bash
+#!/bin/sh
 
-export version=0.3.1
+export version=0.4.3
 export soversion=1
 
 show_help()
@@ -16,12 +16,16 @@ General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
   --libdir=directory      - lib directory (default: $prefix/lib)
+  --datadir=directory     - data directory (default: $prefix/share)
+  --mandir=directory      - man documentation directory (default: $prefix/share/man)
   --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)
+  --disable-sse           - Compile without SSE support (default: on)
+  --arch='arch'           - Compile for a specific architecture (default: none)
+  --cpu='cpu'             - Compile for a specific CPU (default: none)
 
-Module disables options:
+Module disable options:
 
 EOF
 
@@ -44,35 +48,50 @@ build_config()
 		echo "prefix=$prefix"
 		echo "libdir=$libdir"
 		echo "bindir=$prefix/bin"
+		echo "datadir=$datadir"
+		echo "mandir=$mandir"
 		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
 		echo "MMX_FLAGS=-DUSE_MMX"
 
+		[ "$sse" = "true" ] && 
+		echo "SSE_FLAGS=-DUSE_SSE"
+
 		[ "$debug" = "true" ] && 
 		echo "DEBUG_FLAGS=-g"
 
 		echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
-		[ "$cpu" != "" ] &&
-		echo "TARGETARCH=-march=$cpu" &&
-		echo "TARGETCPU=-mcpu=$cpu"
-		echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
+		[ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
+		[ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
+		echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
-		echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+		echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
 		case $targetos in
 		Darwin)
+		sysctl -a hw | grep "x86_64: 1" > /dev/null && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
 		echo "SHFLAGS=-dynamiclib"
 		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
 		Linux)
+		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
 		echo "LIBDL=-ldl"
 		echo "RDYNAMIC=-rdynamic"
+		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
+		;;
+		FreeBSD)
+		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
+		echo "OPTIMISATIONS+=-ffast-math"
+		echo "CFLAGS+=-pthread"
+		echo "SHFLAGS=-shared"
+		echo "RDYNAMIC=-rdynamic"
+		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
 		;;
 		*)
 		;;
@@ -95,19 +114,31 @@ build_config()
 
 build_pkgconfig()
 {
-	for i in framework valerie miracle
-	do
-		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
+	echo prefix="$prefix" > mlt-framework.pc
+	(
+		echo exec_prefix=$prefix
+		echo libdir=$libdir
+		echo includedir=$prefix/include
+		echo datadir=$datadir
+		echo mandir=$mandir
+		echo version=$version
+		echo cflags=`grep ^framework packages.dat | cut -f 2`
+		echo libs=`grep ^framework packages.dat | cut -f 3`
+	) >> mlt-framework.pc
+	cat mlt-framework.pc.in >>mlt-framework.pc
+
+	echo prefix="$prefix" > mlt++.pc
+	(
+		echo exec_prefix=$prefix
+		echo libdir=$libdir
+		echo includedir=$prefix/include
+		echo datadir=$datadir
+		echo mandir=$mandir
+		echo version=$version
+		echo cflags=`grep ^mlt++ packages.dat | cut -f 2`
+		echo libs=`grep ^mlt++ packages.dat | cut -f 3`
+	) >> mlt++.pc
+	cat mlt++.pc.in >>mlt++.pc
 }
 
 # Debug mode
@@ -117,11 +148,16 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export libdir=""
+export datadir=""
+export mandir=""
 export help=0
 export debug=true
 export mmx=true
+export sse=true
 export gpl=false
+export arch=
 export cpu=
+export targetos=
 
 # Determine OS
 targetos=$(uname -s)
@@ -129,9 +165,8 @@ targetos=$(uname -s)
 case $targetos in
 	Darwin)
 	LIBSUF=".dylib"
-	mmx=false
 	;;
-	Linux)
+	Linux|FreeBSD)
 	LIBSUF=".so"
 	;;
 	*)
@@ -147,20 +182,58 @@ do
 		--help )			help=1 ;;
 		--prefix=* )		prefix="${i#--prefix=}" ;;
 		--libdir=* )		libdir="${i#--libdir=}" ;;
+		--datadir=* )		datadir="${i#--datadir=}" ;;
+		--mandir=* )		mandir="${i#--mandir=}" ;;
 		--disable-debug )	debug=false ;;
-		--disable-mmx )		mmx=false ;;
+		--disable-mmx )		mmx=false; sse=false ;;
+		--disable-sse )		sse=false ;;
 		--enable-gpl )		gpl=true ;;
+		--arch=* )			arch="${i#--arch=}" ;;
 		--cpu=* )			cpu="${i#--cpu=}" ;;
 	esac
 done
 
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
+[ "$datadir" = "" ] && datadir=$prefix/share
+[ "$mandir" = "" ] && mandir=$prefix/share/man
 
-# Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
-	grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+	case $targetos in
+		Darwin)
+		sysctl -a hw | grep "mmx: 1" > /dev/null || mmx=false
+		;;
+		Linux)
+		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+		;;
+		FreeBSD)
+		[ "$(make -V MACHINE_CPU:Mmmx)" ] || mmx=false
+		;;
+		*)
+		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
+		;;
+	esac
+fi
+
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+if [ "$sse" = "true" ]
+then
+	case $targetos in
+		Darwin)
+		sysctl -a hw | grep "sse: 1" > /dev/null || sse=false
+		;;
+		Linux)
+		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
+		;;
+		FreeBSD)
+		[ "$(make -V MACHINE_CPU:Msse)" ] || sse=false
+		;;
+		*)
+		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
+		;;
+	esac
 fi
 
 # Show help if requested
@@ -176,7 +249,7 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules inigo valerie miracle humperdink
+for i in framework modules melt mlt++
 do
 	if [ -x src/$i/configure ]
 	then