convert --avformat-cvs to svn and rename option as --avformat-svn (--avformat-cvs...

[melted] / src / modules / avformat / configure

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index ef24081..e3ad9d0 100755 (executable)
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -6,7 +6,7 @@ then
        cat << EOF
 FFMPEG/avformat options:
 
-  --avformat-cvs          - Obtain ffmpeg from CVS
+  --avformat-svn          - Obtain ffmpeg from Subversion
   --avformat-shared=path  - Link against a shared installation of ffmpeg (default)
   --avformat-static=path  - Link against a static ffmpeg dev tree
   --avformat-ldextra=libs - Provide additional libs to link with
@@ -15,7 +15,7 @@ FFMPEG/avformat options:
 EOF
 
 else
-        targetos=$(uname -s)
+       targetos=$(uname -s)
        case $targetos in
        Darwin)
                export LIBSUF=.dylib
@@ -27,15 +27,25 @@ else
                ;;
        esac
                
+       bits=$(uname -m)
+       case $bits in
+       x86_64)
+               export LIBDIR=lib64
+               ;;
+       *)
+               export LIBDIR=lib
+               ;;
+       esac
+
        echo > config.mak
 
        export static_ffmpeg=
-       export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
+       export shared_ffmpeg=`which ffmpeg`
        export extra_libs=
-       export cvs_ffmpeg=
+       export svn_ffmpeg=
        export avformat_suffix=
 
-       if [ "$shared_ffmpeg" != "" ]
+       if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
        then
                # Chop ffmpeg 
                shared_ffmpeg=`dirname $shared_ffmpeg`
@@ -49,31 +59,31 @@ else
                        --avformat-static=* )   static_ffmpeg="${i#--avformat-static=}" ;;
                        --avformat-shared=* )   shared_ffmpeg="${i#--avformat-shared=}" ;;
                        --avformat-ldextra=* )  extra_libs="${i#--avformat-ldextra=}" ;;
-                       --avformat-cvs )                cvs_ffmpeg=true ;;
+                       --avformat-svn )                svn_ffmpeg=true ;;
+                       --avformat-cvs )                svn_ffmpeg=true ;;
                        --avformat-suffix=* )   avformat_suffix="${i#--avformat-suffix=}" ;;
                esac
        done
 
-       if [ "$cvs_ffmpeg" != "" ]
+       if [ "$svn_ffmpeg" != "" ]
        then
                [ ! -d "ffmpeg" ] && ( 
                        echo
                        echo "Checking out ffmpeg/avformat - no password required"
                        echo
-                       cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg login
-                       cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
+                       svn checkout svn://svn.mplayerhq.hu/ffmpeg/trunk ffmpeg
                )
                [ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared --build-suffix="$avformat_suffix" )
                #[ ! -f "ffmpeg/ffmpeg.patch" ] && ( cd ffmpeg ; cp ../ffmpeg.patch . ; patch -p0 < ffmpeg.patch )
-               echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec" >> config.mak
+               echo "CFLAGS+=-I`pwd`/ffmpeg/libavformat -I`pwd`/ffmpeg/libavcodec -I`pwd`/ffmpeg/libavutil" >> config.mak
                echo "LOCAL_FFMPEG=1" >> config.mak
                extra_libs="$extra_libs -lz"
        elif [ "$static_ffmpeg" != "" ]
        then 
                if [ -d "$static_ffmpeg" ]
                then
-                       echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec" >> config.mak
-                       echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec" >> config.mak
+                       echo "CFLAGS+=-I$static_ffmpeg/libavformat -I$static_ffmpeg/libavcodec -I$static_ffmpeg/libavutil" >> config.mak
+                       echo "LDFLAGS+=-L$static_ffmpeg/libavformat -L$static_ffmpeg/libavcodec -L$static_ffmpeg/libavutil" >> config.mak
                        [ $targetos = "Darwin" ] &&
                                echo "LDFLAGS+=-single_module" >> config.mak
                else
@@ -82,13 +92,13 @@ else
                        echo 0
                fi
        else 
-               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat.so" ]
+               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
                then
                        echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-                       echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak
+                       echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
                else
                        echo "avformat: No build environment found. "
-                       echo "          Try configuring mlt with --avformat-cvs."
+                       echo "          Try configuring mlt with --avformat-svn."
                        touch ../disable-avformat
                        exit 0
                fi