bump versions for 0.3.0 release

[melted] / configure

diff --git a/configure b/configure
index ba046e9..050f55a 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,9 @@
-#!/bin/sh
+#!/bin/bash
 
-function show_help
+export version=0.3.0
+export soversion=1
+
+show_help()
 {
        cat << EOF
 Non-autotool config script for MLT.
@@ -12,8 +15,8 @@ Help options:
 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)
@@ -33,11 +36,13 @@ EOF
        echo
 }
 
-function build_config
+build_config()
 {
        (
                echo "version=$version"
+               echo "soversion=$soversion"
                echo "prefix=$prefix"
+               echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
                echo "targetos=$targetos"
 
@@ -79,6 +84,7 @@ function build_config
        (
                echo export version=$version
                echo export prefix=$prefix
+               echo export libdir=$libdir
                echo export bindir=$prefix/bin
        ) >> mlt-config
 
@@ -87,17 +93,19 @@ function build_config
        echo -n > packages.dat
 }
 
-function build_pkgconfig
+build_pkgconfig()
 {
        for i in framework valerie miracle
        do
-               echo "prefix=$prefix" >mlt-$i.pc
-               echo "exec_prefix=$prefix" >>mlt-$i.pc
-               echo "libdir=$prefix/lib" >>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
 }
@@ -108,13 +116,12 @@ set +x
 # Define build directory for scripts called
 export build_dir=`dirname $0`
 export prefix=/usr/local
+export libdir=""
 export help=0
-export version=0.1.1
 export debug=true
 export mmx=true
 export gpl=false
 export cpu=
-export motionest=false
 
 # Determine OS
 targetos=$(uname -s)
@@ -139,14 +146,17 @@ do
        case $i in
                --help )                        help=1 ;;
                --prefix=* )            prefix="${i#--prefix=}" ;;
+               --libdir=* )            libdir="${i#--libdir=}" ;;
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
                --enable-gpl )          gpl=true ;;
-               --enable-motion-est )   motionest=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 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)
 if [ "$mmx" = "true" ]
 then
@@ -154,7 +164,16 @@ then
 fi
 
 # Show help if requested
-[ $help = 1 ] && show_help || build_config
+if [ $help = 1 ]
+then
+       show_help
+else
+       # Log the configuration history
+       date >> config.log
+       echo "$0 $@" >> config.log
+
+       build_config
+fi
 
 # Iterate through each of the components
 for i in framework modules inigo valerie miracle humperdink
@@ -178,8 +197,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