From: Daniel Stenberg <daniel@haxx.se>
Date: Tue, 9 Mar 2004 11:24:36 +0000 (+0000)
Subject: remove ares/aclocal.m4 before cvs update to prevent bad conflicts
X-Git-Tag: curl-7_11_1~82
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=863473a8566df02a7c8ac0cc57005e84a7189419;p=thirdparty%2Fcurl.git

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

diff --git a/testcurl.sh b/testcurl.sh
index 1b63c68c93..043f66ca29 100755
--- 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() {