version bump

[melted] / configure

diff --git a/configure b/configure
index 60a9b63..a5f0312 100755 (executable)
--- a/configure
+++ b/configure
@@ -3,24 +3,33 @@
 function show_help
 {
        cat << EOF
-Funky non-autotool config script for MLT.
+Non-autotool config script for MLT.
 
-       Options are:
+Help options:
+
+  --help                  - this information
+
+General build options:
+
+  --prefix=directory      - install prefix for path (default: $prefix)
+  --enable-gpl            - Enable GPL 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)
+
+Module disables options:
 
-       --help                  - this information
-       --prefix=directory      - install prefix for path (default: $prefix)
-       --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)
 EOF
 
        for i in src/modules/*
        do
-               [ -d $i ] && [ "`basename $i`" != "CVS" ] && basename $i
+               [ -d $i ] && [ "`basename $i`" != "CVS" ] && echo `basename $i` `[ -f $i/gpl ] && echo [GPL]`
        done |
-       awk '{ printf( "   --disable-%-14.14s- Disable the %s module\n", $1, $1 ); }'
+       awk '{ printf( "  --disable-%-14.14s- Disable the %s module %s\n", $1, $1, $2 ); }'
 
        echo
+       echo "  NOTE: libraries marked [GPL] will not be built unless --enable-gpl is stipulated."
+       echo
 }
 
 function build_config
@@ -39,11 +48,14 @@ function build_config
                echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
                [ "$cpu" != "" ] &&
-               echo "TARGET_ARCH=-march=$cpu" &&
-               echo "TARGET_CPU=-mcpu=$cpu"
+               echo "TARGETARCH=-march=$cpu" &&
+               echo "TARGETCPU=-mcpu=$cpu"
+
+               [ "`uname`" = "Linux" ] &&
+               echo "LIBDL=-ldl"
 
-               echo "OPTIMISATIONS=-O4 \$(TARGET_ARCH) \$(TARGET_CPU) -pipe -ffast-math -fomit-frame-pointer"
-               echo "CFLAGS=-Wall \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
+               echo "OPTIMISATIONS=-O4 -pipe -ffast-math -fomit-frame-pointer"
+               echo "CFLAGS+=-Wall \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE) -pthread"
        ) > config.mak
 
        echo "#!/bin/sh" > mlt-config
@@ -80,19 +92,21 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export help=0
-export version=0.0.3
+export version=0.1.1
 export debug=true
 export mmx=true
+export gpl=false
 export cpu=
 
 # Iterate through arguments
-for i in $*
+for i in "$@"
 do
        case $i in
                --help )                        help=1 ;;
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false ;;
+               --enable-gpl )          gpl=true ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -107,7 +121,7 @@ do
        then
                [ $help = 0 ] && echo "Configuring `basename $i`:"
                pushd src/$i > /dev/null
-               ./configure $@
+               ./configure "$@"
                [ $? != 0 ] && exit 1
                popd > /dev/null
        fi
@@ -115,3 +129,10 @@ done
 
 # Build the pkg-config files
 build_pkgconfig
+
+# Report GPL Usage
+[ $help != 1 ] && 
+( [ "$gpl" = "false" ] && 
+echo "GPL Components are disabled" || 
+echo "GPL License Used" )
+