dnl (in an ideal world, cvs would understand it's own Tag file format as
dnl a date spec)
-AC_DEFUN(AS_SLURP_FFMPEG,
+AC_DEFUN([AS_SLURP_FFMPEG],
[
# save original dir
FAILED=""
DIRECTORY=`pwd`
# get/update cvs
if test ! -d $1; then mkdir -p $1; fi
- cd $1
+ dnl we need to check $srcdir/$1 or it will always checkout ffmpeg even if it is there
+ dnl at least when top_srcdir != top_builddir.
+ dnl FIXME: unfortunately this makes the checkout go into top_srcdir
+ cd $srcdir/$1
- if test ! -d ffmpeg/CVS; then
+ if test ! -e ffmpeg/README; then
# 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
+ cvs -Q -z4 -d:pserver:anonymous@mplayerhq.hu:/cvsroot/ffmpeg co -D '$2' ffmpeg || FAILED=yes
else
# compare against Tag file and see if it needs updating
if test "`cat Tag`" == "$2"; then
else
cd ffmpeg
AC_MSG_NOTICE(updating ffmpeg cvs code to $2)
- cvs -Q update -dP -D '$2' || FAILED=yes
+ cvs -Q -z4 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