X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=eb20880db5a1837953a7e48cb40928e73a42d26f;hb=5a9b3541e147a343c998b286ada0c87293354d7c;hp=46848b42e5dd648aa7db698651af745e9eeac9cf;hpb=51a48b87e1ac7709db1e7f31a9e20580e63ecbb1;p=mlt

diff --git a/configure b/configure
index 46848b42..eb20880d 100755
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export version=0.5.2
-export soversion=2
+export version=0.9.1
+export soversion=6
 
 show_help()
 {
@@ -14,17 +14,23 @@ Help options:
 
 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)
-  --disable-sse           - Compile without SSE support (default: on)
-  --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)
+  --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)
+  --rename-melt              - Give melt executable a different name (it will not be versioned)
+  --enable-extra-versioning  - Version melt and the data and modules directories
+  --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)
+  --disable-sse              - Compile without SSE support (default: on)
+  --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)
+  --target-os='os'           - Cross-compile to a specific OS (default: $(uname -s))
+  --target-arch='arch'       - Cross-compile to a specific CPU architecture
 
 Module disable options:
 
@@ -51,6 +57,8 @@ build_config()
 		echo "bindir=$prefix/bin"
 		echo "datadir=$datadir"
 		echo "mandir=$mandir"
+		echo "extra_versioning=$extra_versioning"
+		echo "melt_noversion=$melt_noversion"
 		echo "targetos=$targetos"
 
 		[ "$mmx" = "true" ] && 
@@ -67,40 +75,68 @@ build_config()
 
 		echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
+		[ "$amd64" = "true" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
 		[ "$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) \$(SSE2_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+		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)
-		[ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
-		echo "OPTIMISATIONS+=-ffast-math"
-		echo "CFLAGS+=-pthread"
+		Linux|GNU/kFreeBSD|GNU)
+		[ "$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"
-		echo "CFLAGS+=-pthread"
+		[ "$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)
+		[ "$optimisations" = "true" ] &&
+			echo "OPTIMISATIONS+=-ffast-math"
+		echo "CFLAGS+=-fPIC -pthread"
 		echo "SHFLAGS=-shared"
 		echo "RDYNAMIC=-rdynamic"
 		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
 		;;
+		MinGW)
+		[ "$optimisations" = "true" ] &&
+			echo "OPTIMISATIONS+=-ffast-math"
+		echo "SHFLAGS=-shared"
+		echo "LIBDL=-ldl"
+		echo "RDYNAMIC="
+		echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
+		;;		
 		*)
 		;;
 		esac
 		echo "LIBSUF=$LIBSUF"
+		echo "moduledir=${moduledir}"
+		echo "mltdatadir=${mltdatadir}"
+		echo "unversionedmoduledir=${unversionedmoduledir}"
+		echo "unversionedmltdatadir=${unversionedmltdatadir}"
+		echo "meltname=${meltname}"
 	) > config.mak
 
 	echo "#!/bin/sh" > mlt-config
@@ -128,6 +164,9 @@ build_pkgconfig()
 		echo version=$version
 		echo cflags=`grep ^framework packages.dat | cut -f 2`
 		echo libs=`grep ^framework packages.dat | cut -f 3`
+		echo moduledir=${moduledir}
+		echo mltdatadir=${mltdatadir}
+		echo meltbin=${prefix}/bin/${meltname}
 	) >> mlt-framework.pc
 	cat mlt-framework.pc.in >>mlt-framework.pc
 
@@ -155,55 +194,102 @@ 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 gpl3=false
 export arch=
 export cpu=
-export targetos=
+export targetos=$(uname -s)
+export targetarch=
+export amd64=false
+export extra_versioning=false
+export melt_noversion=false
+
+# Define the compiler used in tests (gcc is not installed everywhere)
+: ${CC:=gcc}
+
+# Iterate through arguments
+for i in "$@"
+do
+	case $i in
+		--help )			help=1 ;;
+		--prefix=* )			prefix="${i#--prefix=}" ;;
+		--libdir=* )			libdir="${i#--libdir=}" ;;
+		--datadir=* )			datadir="${i#--datadir=}" ;;
+		--mandir=* )			mandir="${i#--mandir=}" ;;
+		--rename-melt=* )		meltname="${i#--rename-melt=}"; melt_noversion=true ;;
+		--enable-extra-versioning )	extra_versioning=true ;;
+		--enable-debug )		optimisations=false ;;
+		--disable-debug )		debug=false ;;
+		--disable-mmx )			mmx=false; sse=false; sse2=false ;;
+		--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=}" ;;
+		--target-os=* )			targetos="${i#--target-os=}" ;;
+		--target-arch=* )		targetarch="${i#--target-arch=}" ;;
+	esac
+done
+
+if [ -z "${meltname}" ]
+then
+	if [ "$extra_versioning" = "false" ]
+	then
+		meltname=melt
+	else
+		meltname=melt${soversion}
+	fi
+fi
 
-# Determine OS
-targetos=$(uname -s)
 # Chose appropriate suffix for libraries
 case $targetos in
 	Darwin)
 	LIBSUF=".dylib"
+	if [ "$targetarch" = "" ]
+	then
+		sysctl -a hw | grep "x86_64: 1" > /dev/null
+		[ "$?" = "0" ] && targetarch="amd64"
+	fi
 	;;
-	Linux|FreeBSD)
+	Linux|FreeBSD|NetBSD)
 	LIBSUF=".so"
 	;;
+	MINGW32_NT-*|MinGW|mingw)
+	targetos="MinGW"
+	LIBSUF=".dll"
+	;;
 	*)
 	LIBSUF=".so"
 	;;
 esac
 export LIBSUF
 
-# Iterate through arguments
-for i in "$@"
-do
-	case $i in
-		--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; 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=}" ;;
-	esac
-done
+# Determine if we are compiling for 64-bit Intel architecture
+[ "$targetarch" = "" ] && targetarch=$(uname -m)
+[ "$targetarch" = "amd64" -o "$targetarch" = "x86_64" ] && amd64=true
 
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 [ "$datadir" = "" ] && datadir=$prefix/share
 [ "$mandir" = "" ] && mandir=$prefix/share/man
 
+export unversionedmoduledir=${libdir}/mlt
+export unversionedmltdatadir=${datadir}/mlt
+if [ "$extra_versioning" = "false" ]
+then
+export moduledir=${libdir}/mlt
+export mltdatadir=${datadir}/mlt
+else
+export moduledir=${libdir}/mlt-${soversion}
+export mltdatadir=${datadir}/mlt-${soversion}
+fi
+
 # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
@@ -215,7 +301,7 @@ then
 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
 		;;
 		FreeBSD)
-		[ "$(make -V MACHINE_CPU:Mmmx)" ] || mmx=false
+		[ "$(make -V MACHINE_CPU:Mmmx -f /dev/null)" ] || mmx=false
 		;;
 		*)
 		grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
@@ -234,7 +320,7 @@ then
 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
 		;;
 		FreeBSD)
-		[ "$(make -V MACHINE_CPU:Msse)" ] || sse=false
+		[ "$(make -V MACHINE_CPU:Msse -f /dev/null)" ] || sse=false
 		;;
 		*)
 		grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
@@ -253,7 +339,7 @@ then
 		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
 		;;
 		FreeBSD)
-		[ "$(make -V MACHINE_CPU:Msse2)" ] || sse2=false
+		[ "$(make -V MACHINE_CPU:Msse2 -f /dev/null)" ] || sse2=false
 		;;
 		*)
 		grep sse2 /proc/cpuinfo > /dev/null 2>&1 || sse2=false
@@ -281,7 +367,7 @@ do
 		[ $help = 0 ] && echo "Configuring `basename $i`:"
 		olddir=`pwd`
 		cd src/$i
-		./configure "$@"
+		CC="$CC" ./configure "$@"
 		[ $? != 0 ] && exit 1
 		cd $olddir
 	fi
@@ -290,8 +376,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