adopt to winsock

[melted] / configure

diff --git a/configure b/configure
index dce184f..f486cde 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,12 +1,12 @@
 #!/bin/sh
 
-export version=0.3.3
-export soversion=1
+export version=0.3.11
+export soversion=2
 
 show_help()
 {
        cat << EOF
-Non-autotool config script for MLT.
+Non-autotool config script for Melted.
 
 Help options:
 
@@ -20,7 +20,8 @@ General build options:
   --disable-debug         - Compile without debug support (default: on)
   --disable-mmx           - Compile without MMX support (default: on)
   --disable-sse           - Compile without SSE support (default: on)
-  --cpu='cpu'             - Compile for a specific CPU/architectre (default: none)
+  --arch='arch'           - Compile for a specific architecture (default: none)
+  --cpu='cpu'             - Compile for a specific CPU (default: none)
 
 Module disables options:
 
@@ -58,54 +59,52 @@ build_config()
 
                echo "LARGE_FILE=-D_FILE_OFFSET_BITS=64 -D_LARGEFILE_SOURCE"
 
-               [ "$cpu" != "" ] &&
-               echo "TARGETARCH=-march=$cpu" &&
-               echo "TARGETCPU=-mcpu=$cpu"
-               echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer"
+               [ "$arch" != "" ] && echo "TARGETARCH=-march=$arch"
+               [ "$cpu" != "" ] && echo "TARGETCPU=-mcpu=$cpu"
+               echo "OPTIMISATIONS=-O2 -pipe -fomit-frame-pointer"
 
                echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(SSE_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)"
 
                case $targetos in
                Darwin)
+               sysctl -a hw | grep "x86_64: 1" > /dev/null && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "CFLAGS+=-D__DARWIN__ `sdl-config --cflags`"
                echo "SHFLAGS=-dynamiclib"
                echo "LDFLAGS+=`sdl-config --libs`"
                ;;
                Linux)
+               [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
                echo "RDYNAMIC=-rdynamic"
+               echo "LDFLAGS+=-Wl,--as-needed"
                ;;
                FreeBSD)
+               [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
                echo "OPTIMISATIONS+=-ffast-math"
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "RDYNAMIC=-rdynamic"
+               echo "LDFLAGS+=-Wl,--as-needed"
                ;;
                *)
                ;;
                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
+               
+               echo "CFLAGS += `pkg-config --cflags mlt-framework`"
+               echo "LDFLAGS += `pkg-config --libs mlt-framework`"
 
-       cat < mlt-config-template >> mlt-config
+       ) > config.mak
 
        echo -n > packages.dat
 }
 
 build_pkgconfig()
 {
-       for i in framework valerie miracle
+       for i in mvcp melted melted++
        do
                echo prefix="$prefix" > mlt-$i.pc
                (
@@ -132,6 +131,7 @@ export debug=true
 export mmx=true
 export sse=true
 export gpl=false
+export arch=
 export cpu=
 export targetos=
 
@@ -159,9 +159,10 @@ do
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --libdir=* )            libdir="${i#--libdir=}" ;;
                --disable-debug )       debug=false ;;
-               --disable-mmx )         mmx=false ;;
+               --disable-mmx )         mmx=false; sse=false ;;
                --disable-sse )         sse=false ;;
                --enable-gpl )          gpl=true ;;
+               --arch=* )                      arch="${i#--arch=}" ;;
                --cpu=* )                       cpu="${i#--cpu=}" ;;
        esac
 done
@@ -169,12 +170,12 @@ done
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
 
-# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly)
+# Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
 then
        case $targetos in
                Darwin)
-               sysctl -a hw | grep mmx: > /dev/null | mmx=false
+               sysctl -a hw | grep "mmx: 1" > /dev/null || mmx=false
                ;;
                Linux)
                grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false
@@ -188,12 +189,12 @@ then
        esac
 fi
 
-# Double check SSE (Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
+# Double check SSE (Darwin, Linux and FreeBSD supported, may end up disabling SSE on other platforms incorrectly)
 if [ "$sse" = "true" ]
 then
        case $targetos in
                Darwin)
-               sysctl -a hw | grep sse: > /dev/null | sse=false
+               sysctl -a hw | grep "sse: 1" > /dev/null || sse=false
                ;;
                Linux)
                grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false
@@ -220,16 +221,19 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules inigo valerie miracle humperdink
+for i in mvcp melted melted++ mvcp-client modules
 do
-       if [ -x src/$i/configure ]
+       if [ "$gpl" = "true" -o ! -f src/$i/gpl ]
        then
-               [ $help = 0 ] && echo "Configuring `basename $i`:"
-               olddir=`pwd`
-               cd src/$i
-               ./configure "$@"
-               [ $? != 0 ] && exit 1
-               cd $olddir
+               if [ -x src/$i/configure ]
+               then
+                       [ $help = 0 ] && echo "Configuring `basename $i`:"
+                       olddir=`pwd`
+                       cd src/$i
+                       ./configure "$@"
+                       [ $? != 0 ] && exit 1
+                       cd $olddir
+               fi
        fi
 done