From: Richard Levitte <levitte@openssl.org>
Date: Fri, 15 Apr 2016 07:17:13 +0000 (+0200)
Subject: Don't use a default for --with-zlib-lib on Windows with option 'zlib'
X-Git-Tag: OpenSSL_1_1_0-pre5~16
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=34da11b39d2421f546ec568f355875eec353844c;p=oweals%2Fopenssl.git

Don't use a default for --with-zlib-lib on Windows with option 'zlib'

To begin with, the default should have been the import library, not
the DLL itself.  However, we don't know what directory it's installed
in either way, so we may as well demand the full path from the user

Reviewed-by: Matt Caswell <matt@openssl.org>
---

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 0211a8c936..c28e4e1b51 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -80,7 +80,7 @@
             sub {
                 unless ($disabled{zlib}) {
                     if (defined($disabled{"zlib-dynamic"})) {
-                        return $withargs{zlib_lib} || "zlib1.lib";
+                        return $withargs{zlib_lib};
                     }
                 }
                 return (); },