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

diff --git a/gst-libs/ext/Makefile.am b/gst-libs/ext/Makefile.am
index 7271132..587ac14 100644 (file)
--- a/gst-libs/ext/Makefile.am
+++ b/gst-libs/ext/Makefile.am
@@ -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

diff --git a/m4/as-slurp-ffmpeg.m4 b/m4/as-slurp-ffmpeg.m4
index 8fbb883..f8fe234 100644 (file)
--- a/m4/as-slurp-ffmpeg.m4
+++ b/m4/as-slurp-ffmpeg.m4
@@ -28,7 +28,6 @@ AC_DEFUN(AS_SLURP_FFMPEG,
     # check out cvs code
     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
-    echo "$2" > Tag
   else
     # compare against Tag file and see if it needs updating
     if test "`cat Tag`" == "$2"; then
@@ -38,9 +37,11 @@ AC_DEFUN(AS_SLURP_FFMPEG,
       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
   cd $DIRECTORY