summaryrefslogtreecommitdiffstats
path: root/m4
diff options
context:
space:
mode:
authorBenjamin Otte <otte@gnome.org>2003-06-29 19:46:13 +0000
committerBenjamin Otte <otte@gnome.org>2003-06-29 19:46:13 +0000
commitf4a7caa418d3a283392b1142fe9863ae870ce3b8 (patch)
tree8d29cf94dd85acfa8cc58f5761d28a24eae14223 /m4
parent813b3a530e66bebe1153c8b10abc4cafc99ac772 (diff)
downloadgst-plugins-bad-f4a7caa418d3a283392b1142fe9863ae870ce3b8.tar.gz
gst-plugins-bad-f4a7caa418d3a283392b1142fe9863ae870ce3b8.tar.bz2
gst-plugins-bad-f4a7caa418d3a283392b1142fe9863ae870ce3b8.zip
compatibility fix for new GST_DEBUG stuff.
Original commit message from CVS: compatibility fix for new GST_DEBUG stuff. Includes fixes for missing includes for config.h and unistd.h I only ensured for plugins I can build that they work, so if some of them are still broken, you gotta fix them yourselves unfortunately.
Diffstat (limited to 'm4')
-rw-r--r--m4/as-slurp-ffmpeg.m412
1 files changed, 6 insertions, 6 deletions
diff --git a/m4/as-slurp-ffmpeg.m4 b/m4/as-slurp-ffmpeg.m4
index 9108edbf..625eccd2 100644
--- a/m4/as-slurp-ffmpeg.m4
+++ b/m4/as-slurp-ffmpeg.m4
@@ -18,6 +18,7 @@ dnl a date spec)
AC_DEFUN(AS_SLURP_FFMPEG,
[
# save original dir
+ FAILED=""
DIRECTORY=`pwd`
# get/update cvs
if test ! -d $1; then mkdir -p $1; fi
@@ -27,18 +28,17 @@ 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
- cd ffmpeg
+ echo "$2" > Tag
else
# compare against Tag file and see if it needs updating
- if diff -q Tag ffmpeg/CVS/Tag > /dev/null 2> /dev/null
- then
- # diff returned no problem
+ if test "`cat Tag`" == "$2"; then
AC_MSG_NOTICE(ffmpeg cvs code in sync)
else
- # diff says they differ
cd ffmpeg
- AC_MSG_NOTICE(updating ffmpeg cvs code)
+ AC_MSG_NOTICE(updating ffmpeg cvs code to $2)
cvs -Q update -dP -D '$2' || FAILED=yes
+ cd ..
+ echo "$2" > Tag
fi
fi