From: Andrew Dunstan <andrew@dunslane.net>
Date: Wed, 3 Jan 2018 20:26:39 +0000 (-0500)
Subject: Fix use of config-specific libraries for Windows OpenSSL
X-Git-Tag: REL9_3_21~19
X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=5404145c5ad4b86865c2030f0dbba52686e80c21;p=thirdparty%2Fpostgresql.git

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 bceddfcb962..4a95fd5d0e2 100644
--- a/src/tools/msvc/Solution.pm
+++ b/src/tools/msvc/Solution.pm
@@ -513,10 +513,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})