aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDaniel Stenberg <daniel@haxx.se>2004-03-09 11:24:36 +0000
committerDaniel Stenberg <daniel@haxx.se>2004-03-09 11:24:36 +0000
commit863473a8566df02a7c8ac0cc57005e84a7189419 (patch)
tree7a8db5797bd458ce03ef17df36ff59169ad222f8
parentbe6af69dc73ead538b9086dc646b33172a762078 (diff)
remove ares/aclocal.m4 before cvs update to prevent bad conflicts
-rwxr-xr-xtestcurl.sh5
1 files changed, 5 insertions, 0 deletions
diff --git a/testcurl.sh b/testcurl.sh
index 1b63c68c9..043f66ca2 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() {