X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=ce10ddf212964c3259fd716784959db0b97c6c6c;hb=ef7ca733ee283439a791bfcaea8016bfa3f44a29;hp=24315e9f3f7b624f5a0a45affe622eb4dccde9a5;hpb=65e8ac86ee6e17a12892954ff4a8d46c4766fe0d;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index 24315e9..ce10ddf 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -30,7 +30,7 @@ else
 	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 avformat_suffix=
@@ -72,8 +72,8 @@ else
 	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,7 +82,7 @@ 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/lib/libavformat$LIBSUF" ]
 		then
 			echo "CFLAGS+=-I$shared_ffmpeg/include/ffmpeg " >> config.mak
 			echo "LDFLAGS+=-L$shared_ffmpeg/lib" >> config.mak