log configuration history to config.log

[melted] / configure

diff --git a/configure b/configure
index 0dc352f..02e9fcb 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,4 +1,4 @@
-#!/bin/bash
+#!/bin/sh
 
 function show_help
 {
@@ -12,7 +12,9 @@ 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)
@@ -37,7 +39,9 @@ function build_config
        (
                echo "version=$version"
                echo "prefix=$prefix"
+               echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
+               echo "targetos=$targetos"
 
                [ "$mmx" = "true" ] && 
                echo "MMX_FLAGS=-DUSE_MMX"
@@ -50,18 +54,34 @@ function build_config
                [ "$cpu" != "" ] &&
                echo "TARGETARCH=-march=$cpu" &&
                echo "TARGETCPU=-mcpu=$cpu"
-
-               [ "`uname`" = "Linux" ] &&
+               echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer"
+
+               echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
+
+               case $targetos in
+               Darwin)
+               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"
-
-               echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
-               echo "CFLAGS+=-Wall \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
+               echo "RDYNAMIC=-rdynamic"
+               ;;
+               *)
+               ;;
+               esac
+               echo "LIBSUF=$LIBSUF"
        ) > config.mak
 
        echo "#!/bin/sh" > mlt-config
        (
                echo export version=$version
                echo export prefix=$prefix
+               echo export libdir=$libdir
                echo export bindir=$prefix/bin
        ) >> mlt-config
 
@@ -76,7 +96,7 @@ function build_pkgconfig
        do
                echo "prefix=$prefix" >mlt-$i.pc
                echo "exec_prefix=$prefix" >>mlt-$i.pc
-               echo "libdir=$prefix/lib" >>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
@@ -91,12 +111,31 @@ 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.0.3
+export version=0.2.1
 export debug=true
 export mmx=true
 export gpl=false
 export cpu=
+export motionest=false
+
+# Determine OS
+targetos=$(uname -s)
+# Chose appropriate suffix for libraries
+case $targetos in
+       Darwin)
+       LIBSUF=".dylib"
+       mmx=false
+       ;;
+       Linux)
+       LIBSUF=".so"
+       ;;
+       *)
+       LIBSUF=".so"
+       ;;
+esac
+export LIBSUF
 
 # Iterate through arguments
 for i in "$@"
@@ -104,15 +143,35 @@ 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
+       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
@@ -120,10 +179,11 @@ do
        if [ -x src/$i/configure ]
        then
                [ $help = 0 ] && echo "Configuring `basename $i`:"
-               pushd src/$i > /dev/null
+               olddir=`pwd`
+               cd src/$i
                ./configure "$@"
                [ $? != 0 ] && exit 1
-               popd > /dev/null
+               cd $olddir
        fi
 done
 
@@ -136,3 +196,7 @@ build_pkgconfig
 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