diff options
author | Guenter Knauf <lists@gknw.net> | 2012-07-19 16:31:08 +0200 |
---|---|---|
committer | Guenter Knauf <lists@gknw.net> | 2012-07-19 16:31:08 +0200 |
commit | c27cc4cfe08f61a5a47503c037579cd13fd8b32e (patch) | |
tree | 4b3864f5b316e3478bb4d7bd7490f35a574e211d | |
parent | dc470723b12d475551101fa85d9f25ae5127ea5c (diff) |
Follow-up fix to detect SSL libs with MinGW.
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.
-rwxr-xr-x | tests/runtests.pl | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/tests/runtests.pl b/tests/runtests.pl index de636e1ea..902033448 100755 --- a/tests/runtests.pl +++ b/tests/runtests.pl @@ -2257,6 +2257,10 @@ sub checksystem { # through a shell. chomp($pwd = `cygpath -m $pwd`); } + if ($libcurl =~ /winssl/i) { + $has_winssl=1; + $ssllib="WinSSL"; + } elsif ($libcurl =~ /openssl/i) { $has_openssl=1; $ssllib="OpenSSL"; @@ -2281,10 +2285,6 @@ sub checksystem { $has_axtls=1; $ssllib="axTLS"; } - elsif ($libcurl =~ /winssl/i) { - $has_winssl=1; - $ssllib="WinSSL"; - } } elsif($_ =~ /^Protocols: (.*)/i) { # these are the protocols compiled in to this libcurl |