make ffmpeg erroring out work:

Original commit message from CVS:
make ffmpeg erroring out work:
- don't built gst-libs/ext/ffmpeg
- don't update Tag when cvs command fails
This commit is contained in:
Benjamin Otte 2003-09-27 16:44:53 +00:00
parent 6a20a88b6d
commit 523db3004d
2 changed files with 10 additions and 3 deletions

View file

@ -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 DIST_SUBDIRS= ffmpeg mplex

View file

@ -28,7 +28,6 @@ AC_DEFUN(AS_SLURP_FFMPEG,
# check out cvs code # check out cvs code
AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1) AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1)
cvs -Q -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes cvs -Q -d:pserver:anonymous@cvs.ffmpeg.sourceforge.net:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes
echo "$2" > Tag
else else
# compare against Tag file and see if it needs updating # compare against Tag file and see if it needs updating
if test "`cat Tag`" == "$2"; then if test "`cat Tag`" == "$2"; then
@ -38,9 +37,11 @@ AC_DEFUN(AS_SLURP_FFMPEG,
AC_MSG_NOTICE(updating ffmpeg cvs code to $2) AC_MSG_NOTICE(updating ffmpeg cvs code to $2)
cvs -Q update -dP -D '$2' || FAILED=yes cvs -Q update -dP -D '$2' || FAILED=yes
cd .. cd ..
echo "$2" > Tag
fi fi
fi fi
if test "x$FAILED" != "xyes"; then
echo "$2" > Tag
fi
# now go back # now go back
cd $DIRECTORY cd $DIRECTORY