generic-library/curl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Follow-up fix to detect SSL libs with MinGW.

Browse Source 
1) the check for winssl needs to come before nss check
2) the SSL checks must begin with a new if or else we will
never find any SSL lib with MinGW.
This commit is contained in:
Guenter Knauf 2012-07-19 16:31:08 +02:00
parent dc470723b1
commit c27cc4cfe0
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
tests/runtests.pl
View File

@ -2257,6 +2257,10 @@ sub checksystem {
# through a shell. # through a shell.
chomp($pwd = `cygpath -m $pwd`); chomp($pwd = `cygpath -m $pwd`);
} }
if ($libcurl =~ /winssl/i) {
$has_winssl=1;
$ssllib="WinSSL";
}
elsif ($libcurl =~ /openssl/i) { elsif ($libcurl =~ /openssl/i) {
$has_openssl=1; $has_openssl=1;
$ssllib="OpenSSL"; $ssllib="OpenSSL";
@ -2281,10 +2285,6 @@ sub checksystem {
$has_axtls=1; $has_axtls=1;
$ssllib="axTLS"; $ssllib="axTLS";
} }
elsif ($libcurl =~ /winssl/i) {
$has_winssl=1;
$ssllib="WinSSL";
}
} }
elsif($_ =~ /^Protocols: (.*)/i) { elsif($_ =~ /^Protocols: (.*)/i) {
# these are the protocols compiled in to this libcurl # these are the protocols compiled in to this libcurl