X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=89307f346b9c671a8e39d714786f79d5b97c69a9;hb=c9e76a22200def0d71eeb9dbc3963cfe49143f26;hp=06fb6fa061e4f03896bdd1107478b3d60a22b5d0;hpb=a357d8a33254d4bd4f36a658460d1779ab616982;p=mlt

diff --git a/configure b/configure
index 06fb6fa0..89307f34 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export version=0.7.0
-export soversion=4
+export version=0.7.9
+export soversion=5
 
 show_help()
 {
@@ -18,7 +18,8 @@ General build options:
   --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-gpl            - Enable GPLv2 components
+  --enable-gpl3           - Enable GPLv3 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)
@@ -70,8 +71,14 @@ build_config()
 
 		[ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
 		[ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
-		[ "$optimisations" = "true" ] &&
-			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 -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
@@ -82,7 +89,7 @@ build_config()
 		echo "SHFLAGS=-dynamiclib"
 		echo "LDFLAGS+=`sdl-config --libs`"
 		;;
-		Linux)
+		Linux|GNU/kFreeBSD|GNU)
 		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		[ "$optimisations" = "true" ] &&
 			echo "OPTIMISATIONS+=-ffast-math"
@@ -183,6 +190,7 @@ export mmx=true
 export sse=true
 export sse2=true
 export gpl=false
+export gpl3=false
 export arch=
 export cpu=
 export targetos=
@@ -222,6 +230,7 @@ do
 		--disable-sse )		sse=false; sse2=false ;;
 		--disable-sse2 )	sse2=false ;;
 		--enable-gpl )		gpl=true ;;
+		--enable-gpl3 )		gpl3=true ;;
 		--arch=* )			arch="${i#--arch=}" ;;
 		--cpu=* )			cpu="${i#--cpu=}" ;;
 	esac
@@ -318,8 +327,16 @@ done
 # Build the pkg-config files
 build_pkgconfig
 
-# Report GPL Usage
-[ $help != 1 ] && 
-( [ "$gpl" = "false" ] && 
-echo "GPL Components are disabled" || 
-echo "GPL License Used" )
+# Report license Usage
+if [ $help != 1 ]
+then
+	if [ "$gpl" = "false" ]
+	then
+		echo "LGPLv2.1 license used; GPL components disabled"
+	elif [ "$gpl3" = "false" ]
+	then
+		echo "GPLv2 license used; GPLv3 components disabled"
+	else
+		echo "GPLv3 license used"
+	fi
+fi