X-Git-Url: http://research.m1stereo.tv/gitweb?a=blobdiff_plain;f=src%2Fmodules%2Favformat%2Fconfigure;h=ef2408137b9f4a147806ecab91f55ded90db1df8;hb=cdf7162ebc07120e92166a0e43eaba21ecca25ba;hp=b6a94e37233c1b292f053b88f9f500a0d9cec3fe;hpb=eae86b6ff2d11421e4839ffbe79c4c547d15751a;p=melted

diff --git a/src/modules/avformat/configure b/src/modules/avformat/configure
index b6a94e3..ef24081 100755
--- a/src/modules/avformat/configure
+++ b/src/modules/avformat/configure
@@ -10,6 +10,7 @@ FFMPEG/avformat options:
   --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
+  --avformat-suffix=suff  - Specify a custom suffix for an ffmpeg shared build
 
 EOF
 
@@ -32,6 +33,7 @@ else
 	export shared_ffmpeg=`whereis ffmpeg | cut -f 2 -d' '`
 	export extra_libs=
 	export cvs_ffmpeg=
+	export avformat_suffix=
 
 	if [ "$shared_ffmpeg" != "" ]
 	then
@@ -48,13 +50,20 @@ else
 			--avformat-shared=* )	shared_ffmpeg="${i#--avformat-shared=}" ;;
 			--avformat-ldextra=* )	extra_libs="${i#--avformat-ldextra=}" ;;
 			--avformat-cvs )		cvs_ffmpeg=true ;;
+			--avformat-suffix=* )	avformat_suffix="${i#--avformat-suffix=}" ;;
 		esac
 	done
 
 	if [ "$cvs_ffmpeg" != "" ]
 	then
-		[ ! -d "ffmpeg" ] && cvs -z9 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co ffmpeg
-		[ -d "ffmpeg" ] && ( cd ffmpeg ; ./configure --enable-shared )
+		[ ! -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
+		)
+		[ -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 "LOCAL_FFMPEG=1" >> config.mak
@@ -86,6 +95,7 @@ else
 	fi
 
 	echo "EXTRA_LIBS=$extra_libs" >> config.mak
+	echo "AVFORMAT_SUFFIX=$avformat_suffix" >> config.mak
 
 cat << EOF >> ../producers.dat
 avformat		libmltavformat$LIBSUF