Commit 6dade671 authored by Guenter Knauf's avatar Guenter Knauf
Browse files

renamed generated config.h to curl_config.h in order to avoid clashes when... 

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)
parent 38b88b58

tests/testcurl.pl

+5 −5
Original line number Diff line number Diff line
@@ -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 /^ *#/;

      }