Fix use of config-specific libraries for Windows OpenSSL

Commit 614350a3 allowed for an different builds of OpenSSL libraries on
Windows, but ignored the fact that the alternative builds don't have
config-specific libraries. This patch fixes the Solution file to ask for
the correct libraries.

per offline discussions with Leonardo Cecchi and Marco Nenciarini,

Backpatch to all live branches.

diff --git a/src/tools/msvc/Solution.pm b/src/tools/msvc/Solution.pm
index 7ae6d371e9c4ab65012f8fa8eb6e2a52aa9d38ba..9ba3acf4f77b31b46cac59b0fa3b4c72402e7321 100644 (file)
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -533,10 +533,12 @@ sub AddProject
        }
        else
        {
+           # We don't expect the config-specific library to be here,
+           # so don't ask for it in last parameter
            $proj->AddLibrary(
-               $self->{options}->{openssl} . '\lib\ssleay32.lib', 1);
+               $self->{options}->{openssl} . '\lib\ssleay32.lib', 0);
            $proj->AddLibrary(
-               $self->{options}->{openssl} . '\lib\libeay32.lib', 1);
+               $self->{options}->{openssl} . '\lib\libeay32.lib', 0);
        }
    }
    if ($self->{options}->{nls})