log configuration history to config.log

[melted] / configure

diff --git a/configure b/configure
index 9808ff3..02e9fcb 100755 (executable)
--- a/configure
+++ b/configure
@@ -12,6 +12,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
   --enable-motion-est    - Enable motion estimation components
   --disable-debug         - Compile without debug support (default: on)
@@ -38,6 +39,7 @@ function build_config
        (
                echo "version=$version"
                echo "prefix=$prefix"
+               echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
                echo "targetos=$targetos"
 
@@ -52,17 +54,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+=-D__DARWIN__ `sdl-config --cflags`"
                echo "SHFLAGS=-dynamiclib"
-               echo "LIBDL=`sdl-config --libs`"
+               echo "LDFLAGS+=`sdl-config --libs`"
                ;;
                Linux)
+               echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
@@ -78,6 +81,7 @@ function build_config
        (
                echo export version=$version
                echo export prefix=$prefix
+               echo export libdir=$libdir
                echo export bindir=$prefix/bin
        ) >> mlt-config
 
@@ -92,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
@@ -107,8 +111,9 @@ 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 version=0.2.1
 export debug=true
 export mmx=true
 export gpl=false
@@ -138,6 +143,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 ;;
@@ -146,6 +152,9 @@ 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" ]
 then
@@ -153,7 +162,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