configure, NEWS: bump to version 0.3.2 and update release notes

[melted] / configure

diff --git a/configure b/configure
index 26d0bed..29c962f 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,4 +1,7 @@
-#!/bin/bash
+#!/bin/sh
+
+export version=0.3.2
+export soversion=1
 
 show_help()
 {
@@ -14,7 +17,6 @@ General build options:
   --prefix=directory      - install prefix for path (default: $prefix)
   --libdir=directory      - lib directory (default: $prefix/lib)
   --enable-gpl            - Enable GPL components
-  --enable-motion-est    - Enable motion estimation 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)
@@ -38,6 +40,7 @@ build_config()
 {
        (
                echo "version=$version"
+               echo "soversion=$soversion"
                echo "prefix=$prefix"
                echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
@@ -54,7 +57,7 @@ build_config()
                [ "$cpu" != "" ] &&
                echo "TARGETARCH=-march=$cpu" &&
                echo "TARGETCPU=-mcpu=$cpu"
-               echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
+               echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer"
 
                echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
@@ -71,6 +74,12 @@ build_config()
                echo "LIBDL=-ldl"
                echo "RDYNAMIC=-rdynamic"
                ;;
+               FreeBSD)
+               echo "OPTIMISATIONS+=-ffast-math"
+               echo "CFLAGS+=-pthread"
+               echo "SHFLAGS=-shared"
+               echo "RDYNAMIC=-rdynamic"
+               ;;
                *)
                ;;
                esac
@@ -94,13 +103,15 @@ build_pkgconfig()
 {
        for i in framework valerie miracle
        do
-               echo "prefix=$prefix" >mlt-$i.pc
-               echo "exec_prefix=$prefix" >>mlt-$i.pc
-               echo "libdir=$libdir" >>mlt-$i.pc
-               echo "includedir=$prefix/include" >>mlt-$i.pc
-               echo "version=$version" >>mlt-$i.pc
-               echo "cflags=`grep ^$i packages.dat | cut -f 2`" >>mlt-$i.pc
-               echo "libs=`grep ^$i packages.dat | cut -f 3`" >>mlt-$i.pc
+               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
 }
@@ -113,12 +124,10 @@ export build_dir=`dirname $0`
 export prefix=/usr/local
 export libdir=""
 export help=0
-export version=0.2.2
 export debug=true
 export mmx=true
 export gpl=false
 export cpu=
-export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -128,7 +137,7 @@ case $targetos in
        LIBSUF=".dylib"
        mmx=false
        ;;
-       Linux)
+       Linux|FreeBSD)
        LIBSUF=".so"
        ;;
        *)
@@ -147,7 +156,6 @@ do
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
                --enable-gpl )          gpl=true ;;
-               --enable-motion-est )   motionest=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -155,10 +163,20 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (may end up disabling mmx on non-linux platforms incorrectly)
+# Double check mmx (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
+               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
 
 # Show help if requested
@@ -195,8 +213,3 @@ build_pkgconfig
 ( [ "$gpl" = "false" ] && 
 echo "GPL Components are disabled" || 
 echo "GPL License Used" )
-
-if [ "$motionest" = "true" -a "$gpl" = "false" ]
-then
-       echo "Add the --enable-gpl flag to build the motion estimation components."
-fi