X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;ds=sidebyside;f=configure;h=c980af3fad4b9fae4faefacb42962d2a9672a52e;hb=bc5432678809b945cbb36bec73d75c1f162e932c;hp=894b5d80848a7093d3830b0f66994aee506f999c;hpb=7fd4b678aec4cace40b23077c7e1275c16f45a1c;p=mlt

diff --git a/configure b/configure
index 894b5d80..c980af3f 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export version=0.3.9
-export soversion=1
+export version=0.7.5
+export soversion=4
 
 show_help()
 {
@@ -16,11 +16,15 @@ 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
+  --enable-debug          - Compile without optimizations support (default: off)
   --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)
+  --disable-sse2          - Compile without SSE2 support (default: on)
+  --arch='arch'           - Compile for a specific architecture (default: none)
   --cpu='cpu'             - Compile for a specific CPU (default: none)
 
 Module disable options:
@@ -46,6 +50,8 @@ build_config()
 		echo "prefix=$prefix"
 		echo "libdir=$libdir"
 		echo "bindir=$prefix/bin"
+		echo "datadir=$datadir"
+		echo "mandir=$mandir"
 		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
@@ -54,6 +60,9 @@ build_config()
 		[ "$sse" = "true" ] && 
 		echo "SSE_FLAGS=-DUSE_SSE"
 
+		[ "$sse2" = "true" ] && 
+		echo "SSE2_FLAGS=-DUSE_SSE2"
+
 		[ "$debug" = "true" ] && 
 		echo "DEBUG_FLAGS=-g"
 
@@ -61,33 +70,61 @@ build_config()
 
 		[ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
 		[ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
-		echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
+		if [ "$optimisations" = "true" ]
+		then
+			echo "OPTIMISATIONS=-O2 -pipe"
+			# Since gcc 4.6, this optimization enabled with -O1 causes filter_line_sse2 to crash.
+			echo "OPTIMISATIONS+=-fno-tree-dominator-opts"
+			# Since gcc 4.6, this optimization enabled with -O2 causes filter_line_sse2 to crash.
+			echo "OPTIMISATIONS+=-fno-tree-pre"
+		fi
 
-		echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
-		echo "LDFLAGS+=-Wl,--as-needed"
+		echo "CFLAGS+=-Wall -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_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 "CFLAGS+=-fPIC -D__DARWIN__ `sdl-config --cflags`"
 		echo "SHFLAGS=-dynamiclib"
 		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
-		Linux)
+		Linux|GNU/kFreeBSD)
 		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
-		echo "OPTIMISATIONS+=-ffast-math"
-		echo "CFLAGS+=-pthread"
+		[ "$optimisations" = "true" ] &&
+			echo "OPTIMISATIONS+=-ffast-math"
+		echo "CFLAGS+=-fPIC -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"
+		[ "$(uname -m)" = "amd64" -o "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
+		[ "$optimisations" = "true" ] &&
+			echo "OPTIMISATIONS+=-ffast-math"
+		echo "CFLAGS+=-fPIC -pthread"
+		echo "SHFLAGS=-shared"
+		echo "RDYNAMIC=-rdynamic"
+		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
+		;;
+		NetBSD)
+		[ "$(uname -m)" = "amd64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
+		[ "$optimisations" = "true" ] &&
+			echo "OPTIMISATIONS+=-ffast-math"
 		echo "CFLAGS+=-pthread"
 		echo "SHFLAGS=-shared"
 		echo "RDYNAMIC=-rdynamic"
+		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
 		;;
+		MinGW)
+		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
+		[ "$optimisations" = "true" ] &&
+			echo "OPTIMISATIONS+=-ffast-math"
+		echo "SHFLAGS=-shared"
+		echo "LIBDL=-ldl"
+		echo "RDYNAMIC="
+		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
+		;;		
 		*)
 		;;
 		esac
@@ -114,6 +151,8 @@ build_pkgconfig()
 		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`
@@ -125,6 +164,8 @@ build_pkgconfig()
 		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`
@@ -139,10 +180,14 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export libdir=""
+export datadir=""
+export mandir=""
 export help=0
+export optimisations=true
 export debug=true
 export mmx=true
 export sse=true
+export sse2=true
 export gpl=false
 export arch=
 export cpu=
@@ -155,9 +200,13 @@ case $targetos in
 	Darwin)
 	LIBSUF=".dylib"
 	;;
-	Linux|FreeBSD)
+	Linux|FreeBSD|NetBSD)
 	LIBSUF=".so"
 	;;
+	MINGW32_NT-*)
+	targetos="MinGW"
+	LIBSUF=".dll"
+	;;
 	*)
 	LIBSUF=".so"
 	;;
@@ -171,9 +220,13 @@ do
 		--help )			help=1 ;;
 		--prefix=* )		prefix="${i#--prefix=}" ;;
 		--libdir=* )		libdir="${i#--libdir=}" ;;
+		--datadir=* )		datadir="${i#--datadir=}" ;;
+		--mandir=* )		mandir="${i#--mandir=}" ;;
+		--enable-debug )	optimisations=false ;;
 		--disable-debug )	debug=false ;;
-		--disable-mmx )		mmx=false; sse=false ;;
-		--disable-sse )		sse=false ;;
+		--disable-mmx )		mmx=false; sse=false; sse2=false ;;
+		--disable-sse )		sse=false; sse2=false ;;
+		--disable-sse2 )	sse2=false ;;
 		--enable-gpl )		gpl=true ;;
 		--arch=* )			arch="${i#--arch=}" ;;
 		--cpu=* )			cpu="${i#--cpu=}" ;;
@@ -182,6 +235,8 @@ 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 (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
@@ -221,6 +276,25 @@ then
 	esac
 fi
 
+# Double check SSE2 (Darwin, Linux and FreeBSD supported, may end up disabling SSE2 on other platforms incorrectly)
+if [ "$sse2" = "true" ]
+then
+	case $targetos in
+		Darwin)
+		sysctl -a hw | grep "sse2: 1" > /dev/null || sse2=false
+		;;
+		Linux)
+		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
+		;;
+		FreeBSD)
+		[ "$(make -V MACHINE_CPU:Msse2)" ] || sse2=false
+		;;
+		*)
+		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
+		;;
+	esac
+fi
+
 # Show help if requested
 if [ $help = 1 ]
 then
@@ -234,7 +308,7 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules melt mlt++
+for i in framework modules melt mlt++ swig
 do
 	if [ -x src/$i/configure ]
 	then