Convert audio structures to arrays.

[mlt] / configure

diff --git a/configure b/configure
index 3022c8609b111d30c6891e1d9c004514c67ed1c6..b5303c09a9463ac920487a1ed1f265eeb67272d0 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,7 +1,7 @@
 #!/bin/sh
 
-export version=0.3.9
-export soversion=1
+export version=0.4.6
+export soversion=2
 
 show_help()
 {
@@ -16,11 +16,13 @@ General build options:
 
   --prefix=directory      - install prefix for path (default: $prefix)
   --libdir=directory      - lib directory (default: $prefix/lib)
+  --datadir=directory     - data directory (default: $prefix/share)
+  --mandir=directory      - man documentation directory (default: $prefix/share/man)
   --enable-gpl            - Enable GPL 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)
-  --arch='arch'             - Compile for a specific architecture (default: none)
+  --arch='arch'           - Compile for a specific architecture (default: none)
   --cpu='cpu'             - Compile for a specific CPU (default: none)
 
 Module disable options:
@@ -46,6 +48,8 @@ build_config()
                echo "prefix=$prefix"
                echo "libdir=$libdir"
                echo "bindir=$prefix/bin"
+               echo "datadir=$datadir"
+               echo "mandir=$mandir"
                echo "targetos=$targetos"
 
                [ "$mmx" = "true" ] && 
@@ -79,7 +83,7 @@ build_config()
                echo "SHFLAGS=-shared"
                echo "LIBDL=-ldl"
                echo "RDYNAMIC=-rdynamic"
-               echo "LDFLAGS+=-Wl,--as-needed"
+               echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
                ;;
                FreeBSD)
                [ "$(uname -m)" = "x86_64" ] && echo "ARCH_X86_64=1" && echo "CFLAGS+=-DARCH_X86_64"
@@ -87,7 +91,7 @@ build_config()
                echo "CFLAGS+=-pthread"
                echo "SHFLAGS=-shared"
                echo "RDYNAMIC=-rdynamic"
-               echo "LDFLAGS+=-Wl,--as-needed"
+               echo "LDFLAGS+=-Wl,--no-undefined -Wl,--as-needed"
                ;;
                *)
                ;;
@@ -115,6 +119,8 @@ build_pkgconfig()
                echo exec_prefix=$prefix
                echo libdir=$libdir
                echo includedir=$prefix/include
+               echo datadir=$datadir
+               echo mandir=$mandir
                echo version=$version
                echo cflags=`grep ^framework packages.dat | cut -f 2`
                echo libs=`grep ^framework packages.dat | cut -f 3`
@@ -126,6 +132,8 @@ build_pkgconfig()
                echo exec_prefix=$prefix
                echo libdir=$libdir
                echo includedir=$prefix/include
+               echo datadir=$datadir
+               echo mandir=$mandir
                echo version=$version
                echo cflags=`grep ^mlt++ packages.dat | cut -f 2`
                echo libs=`grep ^mlt++ packages.dat | cut -f 3`
@@ -140,6 +148,8 @@ set +x
 export build_dir=`dirname $0`
 export prefix=/usr/local
 export libdir=""
+export datadir=""
+export mandir=""
 export help=0
 export debug=true
 export mmx=true
@@ -172,6 +182,8 @@ do
                --help )                        help=1 ;;
                --prefix=* )            prefix="${i#--prefix=}" ;;
                --libdir=* )            libdir="${i#--libdir=}" ;;
+               --datadir=* )           datadir="${i#--datadir=}" ;;
+               --mandir=* )            mandir="${i#--mandir=}" ;;
                --disable-debug )       debug=false ;;
                --disable-mmx )         mmx=false; sse=false ;;
                --disable-sse )         sse=false ;;
@@ -183,6 +195,8 @@ done
 
 # Determine the libdir if it's not specified in the args
 [ "$libdir" = "" ] && libdir=$prefix/lib
+[ "$datadir" = "" ] && datadir=$prefix/share
+[ "$mandir" = "" ] && mandir=$prefix/share/man
 
 # Double check MMX (Darwin, Linux and FreeBSD supported, may end up disabling MMX on other platforms incorrectly)
 if [ "$mmx" = "true" ]
@@ -235,7 +249,7 @@ else
 fi
 
 # Iterate through each of the components
-for i in framework modules melt mlt++
+for i in framework modules melt mlt++ swig
 do
        if [ -x src/$i/configure ]
        then