From: Benjamin O. <co...@us...> - 2003-09-27 17:07:58
|
CVS Root: /cvsroot/gstreamer Module: gst-plugins Changes by: company Date: Sat Sep 27 2003 09:45:05 PDT Log message: make ffmpeg erroring out work: - don't built gst-libs/ext/ffmpeg - don't update Tag when cvs command fails Modified files: gst-libs/ext : Makefile.am m4 : as-slurp-ffmpeg.m4 Links: http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/gst-libs/ext/Makefile.am.diff?r1=1.3&r2=1.4 http://cvs.sf.net/cgi-bin/viewcvs.cgi/gstreamer/gst-plugins/m4/as-slurp-ffmpeg.m4.diff?r1=1.5&r2=1.6 ====Begin Diffs==== Index: as-slurp-ffmpeg.m4 =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/m4/as-slurp-ffmpeg.m4,v retrieving revision 1.5 retrieving revision 1.6 diff -u -d -r1.5 -r1.6 --- as-slurp-ffmpeg.m4 13 Sep 2003 10:25:22 -0000 1.5 +++ as-slurp-ffmpeg.m4 27 Sep 2003 16:44:53 -0000 1.6 @@ -28,7 +28,6 @@ # check out cvs code AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1) cvs -Q -d:pserver:ano...@cv...:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes - echo "$2" > Tag else # compare against Tag file and see if it needs updating if test "`cat Tag`" == "$2"; then @@ -38,8 +37,10 @@ AC_MSG_NOTICE(updating ffmpeg cvs code to $2) cvs -Q update -dP -D '$2' || FAILED=yes cd .. - echo "$2" > Tag fi + fi + if test "x$FAILED" != "xyes"; then + echo "$2" > Tag fi # now go back Index: Makefile.am =================================================================== RCS file: /cvsroot/gstreamer/gst-plugins/gst-libs/ext/Makefile.am,v retrieving revision 1.3 retrieving revision 1.4 diff -u -d -r1.3 -r1.4 --- Makefile.am 13 Sep 2003 10:25:22 -0000 1.3 +++ Makefile.am 27 Sep 2003 16:44:53 -0000 1.4 @@ -1,3 +1,9 @@ -SUBDIRS = ffmpeg mplex +if USE_FFMPEG +FFMPEG_DIR=ffmpeg +else +FFMPEG_DIR= +endif + +SUBDIRS = $(FFMPEG_DIR) mplex DIST_SUBDIRS= ffmpeg mplex |