]> granicus.if.org Git - curl/commitdiff
Follow-up fix to detect SSL libs with MinGW.
authorGuenter Knauf <lists@gknw.net>
Thu, 19 Jul 2012 14:31:08 +0000 (16:31 +0200)
committerGuenter Knauf <lists@gknw.net>
Thu, 19 Jul 2012 14:31:08 +0000 (16:31 +0200)
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

index de636e1ea29db72178dd73ca495bc29005f16d68..9020334485ca63cea88756b2075fd497d05acd3b 100755 (executable)
@@ -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