bump versions for 0.3.0 release

[melted] / configure

diff --git a/configure b/configure
index bdb91dd..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,6 +15,7 @@ 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
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
@@ -32,12 +36,15 @@ 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"
 
                [ "$mmx" = "true" ] && 
                echo "MMX_FLAGS=-DUSE_MMX"
@@ -50,16 +57,18 @@ function build_config
                [ "$cpu" != "" ] &&
                echo "TARGETARCH=-march=$cpu" &&
                echo "TARGETCPU=-mcpu=$cpu"
+               echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
 
-               echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
                echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
                case $targetos in
                Darwin)
-               echo "CFLAGS+=-DDARWIN"
+               echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
                echo "SHFLAGS=-dynamiclib"
+               echo "LDFLAGS+=`sdl-config --libs`"
                ;;
                Linux)
+               echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
@@ -75,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
 
@@ -83,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
 }
@@ -104,8 +116,8 @@ 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
@@ -134,6 +146,7 @@ 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 ;;
@@ -141,14 +154,26 @@ do
        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" ]
+if [ "$mmx" = "true" ]
 then
        grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
 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
@@ -172,4 +197,3 @@ build_pkgconfig
 ( [ "$gpl" = "false" ] && 
 echo "GPL Components are disabled" || 
 echo "GPL License Used" )
-