From: lilo_booter <lilo_booter@d19143bc-622f-0410-bfdd-b5b2a6649095>
Date: Tue, 29 Nov 2005 12:15:11 +0000 (+0000)
Subject: + 64 bit fix for ffmpeg built externally (should switch to pkg-config here)
X-Git-Url: http://research.m1stereo.tv/gitweb?a=commitdiff_plain;h=01fc881c8eeec166ed062f75edcde55dfba81b19;p=melted

+ 64 bit fix for ffmpeg built externally (should switch to pkg-config here)


git-svn-id: https://mlt.svn.sourceforge.net/svnroot/mlt/trunk/mlt@870 d19143bc-622f-0410-bfdd-b5b2a6649095
---

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index c80628f..f617579 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -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."