From 6769ab2797d0cf1262339a1d556a02a48e188640 Mon Sep 17 00:00:00 2001
From: Daniel Stenberg <daniel@haxx.se>
Date: Sat, 24 Jul 2004 21:24:03 +0000
Subject: if --enable-ares is used, we must run 'buildconf' in the ares dir
 before we run configure.

---
 tests/testcurl.pl | 24 ++++++++++++++++++++----
 1 file changed, 20 insertions(+), 4 deletions(-)

diff --git a/tests/testcurl.pl b/tests/testcurl.pl
index 983ae9e4e..f27069b98 100755
--- a/tests/testcurl.pl
+++ b/tests/testcurl.pl
@@ -316,10 +316,25 @@ if ($CVS) {
     } else {
       mydie "buildconf was NOT successful";
     }
+
+    if($confopts =~ /--enable-ares/) {
+        logit "run buildconf for ares";
+        chdir "ares";
+        open(F, "./buildconf 2>&1 |") or die;
+        open(LOG, ">$buildlog") or die;
+        while (<F>) {
+            next if /warning: underquoted definition of/;
+            print;
+            print LOG;
+        }
+        close(F);
+        close(LOG);
+        chdir "..";
+    }
+
   } else {
-    logit "buildconf was successful (dummy message)";
+      logit "buildconf was successful (dummy message)";
   }
-
 }
 
 if ($gnulikebuild) {
@@ -375,10 +390,11 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
 
   logit "build ares";
   chdir "ares";
+
   if ($targetos ne '') {
-    open(F, "make -f Makefile.$targetos 2>&1 |") or die;
+      open(F, "make -f Makefile.$targetos 2>&1 |") or die;
   } else {
-    open(F, "make 2>&1 |") or die;
+      open(F, "make 2>&1 |") or die;
   }
   while (<F>) {
     s/$pwd//g;
-- 
cgit v1.2.3