mirror of
https://github.com/moparisthebest/curl
synced 2024-12-21 23:58:49 -05:00
renamed generated config.h to curl_config.h in order to avoid clashes when libcurl is used with other projects which also have a config.h (missing bits)
This commit is contained in:
parent
38b88b5892
commit
6dade671ad
@ -566,14 +566,14 @@ else {
|
||||
mydie "no curlbuild.h created/found";
|
||||
}
|
||||
|
||||
logit_spaced "display lib/config$confsuffix.h";
|
||||
open(F, "lib/config$confsuffix.h") or die "lib/config$confsuffix.h: $!";
|
||||
logit_spaced "display lib/curl_config$confsuffix.h";
|
||||
open(F, "lib/curl_config$confsuffix.h") or die "lib/curl_config$confsuffix.h: $!";
|
||||
while (<F>) {
|
||||
print if /^ *#/;
|
||||
}
|
||||
close(F);
|
||||
|
||||
if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
|
||||
if (grepfile("define USE_ARES", "lib/curl_config$confsuffix.h")) {
|
||||
print "\n";
|
||||
logit "setup to build ares";
|
||||
|
||||
@ -602,8 +602,8 @@ if (grepfile("define USE_ARES", "lib/config$confsuffix.h")) {
|
||||
mydie "no ares_build.h created/found";
|
||||
}
|
||||
|
||||
logit_spaced "display ares/config$confsuffix.h";
|
||||
if(open(F, "ares/config$confsuffix.h")) {
|
||||
logit_spaced "display ares/ares_config$confsuffix.h";
|
||||
if(open(F, "ares/ares_config$confsuffix.h")) {
|
||||
while (<F>) {
|
||||
print if /^ *#/;
|
||||
}
|
||||
|
Loading…
Reference in New Issue
Block a user