X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=5c6ff8b86e5b5180c3f32d9b710214f58b8414c7;hb=b92d5da5f5adff2046024e06e3cbe9fa9d51c5f4;hp=e52d58e76c27307227793f6578332d9c88a846dc;hpb=5b363c24e0c71dfc715f4e86ba92bdbed5c85000;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index e52d58e..5c6ff8b 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -42,21 +42,13 @@ else
 	echo > config.mak
 
 	export static_ffmpeg=
-	export shared_ffmpeg=`which ffmpeg`
+	export shared_ffmpeg=$(pkg-config --variable=prefix libavformat)
 	export extra_libs=
 	export svn_ffmpeg=
 	export svn_ffmpeg_extra=
 	export avformat_suffix=
 	export swscale=
 
-	if [ "$shared_ffmpeg" != "" -a -f "$shared_ffmpeg" ]
-	then
-		# Chop ffmpeg 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-		# Chop bin 
-		shared_ffmpeg=`dirname $shared_ffmpeg`
-	fi
-
 	for i in "$@"
 	do
 		case $i in
@@ -124,18 +116,16 @@ else
 			touch ../disable-avformat
 			echo 0
 		fi
-	else 
-		if [ -d "$shared_ffmpeg/include/ffmpeg" -a -e "$shared_ffmpeg/$LIBDIR/libavformat$avformat_suffix$LIBSUF" ]
-		then
-			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
-			echo "LDFLAGS+=-L$shared_ffmpeg/$LIBDIR" >> config.mak
-			[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
-		else
-			echo "avformat: No build environment found. "
-			echo "          Try configuring mlt with --avformat-svn."
-			touch ../disable-avformat
-			exit 0
-		fi
+	elif [ "$shared_ffmpeg" != "" ]
+	then
+		echo "CFLAGS+=$(pkg-config --cflags libavformat)" >> config.mak
+		echo "LDFLAGS+=$(pkg-config --libs libavformat)" >> config.mak
+		[ "$swscale" != "" ] && echo "SWSCALE=1" >> config.mak
+	else
+		echo "avformat: No build environment found. "
+		echo "          Try configuring mlt with --avformat-svn."
+		touch ../disable-avformat
+		exit 0
 	fi
 
 	echo "EXTRA_LIBS=$extra_libs" >> config.mak