From: Richard Levitte <levitte@openssl.org>
Date: Mon, 24 Oct 2016 13:11:29 +0000 (+0200)
Subject: Windows: use default ZLIB1 unless --with-zlib-lib is set
X-Git-Tag: OpenSSL_1_1_0c~26
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=51d8e5ea866a7d606e4f2aa5e45c2f7df2270ace;p=oweals%2Fopenssl.git

Windows: use default ZLIB1 unless --with-zlib-lib is set

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1772)
(cherry picked from commit 475592e2419c5cb3098dfea4c9229d0c09ea7010)
---

diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 566b89b835..3455b3ace8 100644
--- a/Configurations/00-base-templates.conf
+++ b/Configurations/00-base-templates.conf
@@ -80,10 +80,11 @@
             sub {
                 unless ($disabled{zlib}) {
                     if (defined($disabled{"zlib-dynamic"})) {
-                        return $withargs{zlib_lib};
+                        return $withargs{zlib_lib} // "ZLIB1";
                     }
                 }
-                return (); },
+                return ();
+            },
 
         ld              => "link",
         lflags          => "/nologo",