]> git.sesse.net Git - mlt/commitdiff
+ 64 bit fix for ffmpeg built externally (should switch to pkg-config here)
authorlilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Tue, 29 Nov 2005 12:15:11 +0000 (12:15 +0000)
committerlilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Tue, 29 Nov 2005 12:15:11 +0000 (12:15 +0000)
git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@870 d19143bc-622f-0410-bfdd-b5b2a6649095

src/modules/avformat/configure

index c80628f7982e379fe1f42ef7df299ad390a73a3a..f6175794e3774ebcef2d6dfc11442db03b144883 100755 (executable)
@@ -27,6 +27,16 @@ else
                ;;
        esac
                
+       bits=$(uname -m)
+       case $bits in
+       x86_64)
+               export LIBDIR=lib64
+               ;;
+       *)
+               export LIBDIR=lib
+               ;;
+       esac
+
        echo > config.mak
 
        export static_ffmpeg=
@@ -82,10 +92,10 @@ else
                        echo 0
                fi
        else 
-               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/lib/libavformat$LIBSUF" ]
+               if [ -d "$shared_ffmpeg/include/ffmpeg" -a -f "$shared_ffmpeg/$LIBDIR/libavformat$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."