sync with upstream

Original commit message from CVS:
sync with upstream
parent 0556f090
common @ c6f697f5
Subproject commit 90097339543fb0a705447b599d7a36138cba4232
Subproject commit c6f697f5a14c01e88a7cdf417b8e06b4417921c3
dnl slurp-ffmpeg.m4 0.1.1
dnl slurp-ffmpeg.m4 0.1.2
dnl a macro to slurp in ffmpeg's cvs source inside a project tree
dnl taken from Autostar Sandbox, http://autostars.sourceforge.net/
......@@ -15,36 +15,32 @@ dnl the same date
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
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
cd $1
if test ! -e ffmpeg/README; then
if test ! -d ffmpeg/CVS; then
# check out cvs code
AC_MSG_NOTICE(checking out ffmpeg cvs code from $2 into $1)
cvs -Q -z4 -d:pserver:anonymous@mplayerhq.hu:/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
cd ffmpeg
else
# compare against Tag file and see if it needs updating
if test "`cat Tag`" == "$2"; then
if diff -q Tag ffmpeg/CVS/Tag > /dev/null 2> /dev/null
then
# diff returned no problem
AC_MSG_NOTICE(ffmpeg cvs code in sync)
else
# diff says they differ
cd ffmpeg
AC_MSG_NOTICE(updating ffmpeg cvs code to $2)
cvs -Q -z4 update -dP -D '$2' || FAILED=yes
cd ..
AC_MSG_NOTICE(updating ffmpeg cvs code)
cvs -Q update -dP -D '$2' || FAILED=yes
fi
fi
if test "x$FAILED" != "xyes"; then
echo "$2" > Tag
fi
# now go back
cd $DIRECTORY
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment