From c27cc4cfe08f61a5a47503c037579cd13fd8b32e Mon Sep 17 00:00:00 2001 From: Guenter Knauf Date: Thu, 19 Jul 2012 16:31:08 +0200 Subject: [PATCH] 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. --- tests/runtests.pl | 8 ++++---- 1 file 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