Bump version to 0.4.0

[mlt] / configure

diff --git a/configure b/configure
index 7e8f24654237f6984fb8c8516948d2e78da28870..1401930f47df94ded7d4d2ef28236e0b88bcef96 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #!/bin/sh
 
-export version=0.3.6
+export version=0.4.0
 export soversion=1
 
 show_help()
@@ -20,10 +20,10 @@ General build options:
   --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)
+  --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
 
@@ -61,7 +61,7 @@ build_config()
 
                [ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
                [ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
-               echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer"
+               echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
                echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
@@ -79,6 +79,7 @@ build_config()
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
                echo "RDYNAMIC=-rdynamic"
+               echo "LDFLAGS+=-Wl,--as-needed"
                ;;
                FreeBSD)
                [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
@@ -86,6 +87,7 @@ build_config()
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "RDYNAMIC=-rdynamic"
+               echo "LDFLAGS+=-Wl,--as-needed"
                ;;
                *)
                ;;
@@ -108,19 +110,27 @@ 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 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 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
@@ -174,7 +184,7 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
        case $targetos in
@@ -193,7 +203,7 @@ then
        esac
 fi
 
-# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
 if [ "$sse" = "true" ]
 then
        case $targetos in
@@ -225,7 +235,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