X-Git-Url: https://git.sesse.net/?a=blobdiff_plain;f=configure;h=b6334385d1d8f6974f5cdde4eeedff8ee67776a3;hb=1bb40fac1ad8a0882a59e07d09ebe2f2cb6b7b49;hp=47ddfdb55fafde03884478d5f308a700d507df6a;hpb=30bf05a2dc3d17d9cf87300e07e66828fd729c17;p=mlt diff --git a/configure b/configure index 47ddfdb5..b6334385 100755 --- a/configure +++ b/configure @@ -1,6 +1,9 @@ #!/bin/sh -function show_help +export version=0.3.4 +export soversion=1 + +show_help() { cat << EOF Non-autotool config script for MLT. @@ -14,9 +17,9 @@ 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) + --disable-sse - Compile without SSE support (default: on) --cpu='cpu' - Compile for a specific CPU/architectre (default: none) Module disables options: @@ -34,10 +37,11 @@ EOF echo } -function build_config +build_config() { ( echo "version=$version" + echo "soversion=$soversion" echo "prefix=$prefix" echo "libdir=$libdir" echo "bindir=$prefix/bin" @@ -46,6 +50,9 @@ function build_config [ "$mmx" = "true" ] && echo "MMX_FLAGS=-DUSE_MMX" + [ "$sse" = "true" ] && + echo "SSE_FLAGS=-DUSE_SSE" + [ "$debug" = "true" ] && echo "DEBUG_FLAGS=-g" @@ -54,23 +61,32 @@ function build_config [ "$cpu" != "" ] && echo "TARGETARCH=-march=$cpu" && echo "TARGETCPU=-mcpu=$cpu" - echo "OPTIMISATIONS=-O4 -pipe -fomit-frame-pointer" + echo "OPTIMISATIONS=-O3 -pipe -fomit-frame-pointer" - echo "CFLAGS+=-Wall -fPIC -DPIC \$(TARGETARCH) \$(TARGETCPU) \$(OPTIMISATIONS) \$(MMX_FLAGS) \$(DEBUG_FLAGS) \$(LARGE_FILE)" + 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" ;; + 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" + ;; *) ;; esac @@ -90,17 +106,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=$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 - 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 } @@ -113,12 +131,12 @@ export build_dir=`dirname $0` export prefix=/usr/local export libdir="" export help=0 -export version=0.2.1 export debug=true export mmx=true +export sse=true export gpl=false export cpu= -export motionest=false +export targetos= # Determine OS targetos=$(uname -s) @@ -126,9 +144,8 @@ targetos=$(uname -s) case $targetos in Darwin) LIBSUF=".dylib" - mmx=false ;; - Linux) + Linux|FreeBSD) LIBSUF=".so" ;; *) @@ -145,9 +162,9 @@ 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 ;; - --enable-motion-est ) motionest=true ;; --cpu=* ) cpu="${i#--cpu=}" ;; esac done @@ -155,14 +172,55 @@ 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) +# Double check mmx (Linux and FreeBSD supported, may end up disabling mmx on other platforms incorrectly) if [ "$mmx" = "true" ] then - grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false + case $targetos in + Darwin) + sysctl -a hw | grep "mmx: 1" > /dev/null || mmx=false + ;; + Linux) + grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false + ;; + FreeBSD) + [ "$(make -V MACHINE_CPU:Mmmx)" ] || mmx=false + ;; + *) + grep mmx /proc/cpuinfo > /dev/null 2>&1 || mmx=false + ;; + esac +fi + +# Double check SSE (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: 1" > /dev/null || sse=false + ;; + Linux) + grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false + ;; + FreeBSD) + [ "$(make -V MACHINE_CPU:Msse)" ] || sse=false + ;; + *) + grep sse /proc/cpuinfo > /dev/null 2>&1 || sse=false + ;; + esac 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 @@ -186,8 +244,3 @@ build_pkgconfig ( [ "$gpl" = "false" ] && 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