X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=configure;h=948fb5954193f7c4c12af9805d3a26305fa91132;hb=64f9aa2d35148116826be20b153a4231e6829243;hp=ba046e9959a5110e4be734df055e0e168cbe06a7;hpb=64ae2085596a63af531253297fe915e7dbd17c88;p=melted diff --git a/configure b/configure index ba046e9..948fb59 100755 --- 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" @@ -79,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 @@ -93,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 @@ -108,6 +111,7 @@ 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 debug=true @@ -139,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 ;; @@ -147,6 +152,10 @@ do esac done +# Determine the libdir if it's not specified in the args +[ "$libdir" = "" ] && libdir=$prefix/lib +echo $libdir + # Double check mmx (may end up disabling mmx on non-linux platforms incorrectly) if [ "$mmx" = "true" ] then