remove ares/aclocal.m4 before cvs update to prevent bad conflicts

diff --git a/testcurl.sh b/testcurl.sh
index 1b63c68c93e9c9e668eae70787234de3983c786b..043f66ca293e5817399190563f3e0369d183dd77 100755 (executable)
--- a/testcurl.sh
+++ b/testcurl.sh
@@ -180,6 +180,11 @@ cd $CURLDIR
 
 # Do the CVS thing, or not...
 if [ $CVS -eq 1 ]; then
+
+  # this is a temporary fix to make things work again, remove later
+  log "remove ares/aclocal.m4"
+  rm -f ares/aclocal.m4
+
   log "update from CVS"
 
   cvsup() {