if --enable-ares is used, we must run 'buildconf' in the ares dir before
we run configure.
This commit is contained in:
parent
85867cbe94
commit
6769ab2797
@ -316,10 +316,25 @@ if ($CVS) {
|
|||||||
} else {
|
} else {
|
||||||
mydie "buildconf was NOT successful";
|
mydie "buildconf was NOT successful";
|
||||||
}
|
}
|
||||||
} else {
|
|
||||||
logit "buildconf was successful (dummy message)";
|
|
||||||
}
|
|
||||||
|
|
||||||
|
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)";
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
if ($gnulikebuild) {
|
if ($gnulikebuild) {
|
||||||
@ -375,10 +390,11 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
|
|||||||
|
|
||||||
logit "build ares";
|
logit "build ares";
|
||||||
chdir "ares";
|
chdir "ares";
|
||||||
|
|
||||||
if ($targetos ne '') {
|
if ($targetos ne '') {
|
||||||
open(F, "make -f Makefile.$targetos 2>&1 |") or die;
|
open(F, "make -f Makefile.$targetos 2>&1 |") or die;
|
||||||
} else {
|
} else {
|
||||||
open(F, "make 2>&1 |") or die;
|
open(F, "make 2>&1 |") or die;
|
||||||
}
|
}
|
||||||
while (<F>) {
|
while (<F>) {
|
||||||
s/$pwd//g;
|
s/$pwd//g;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user