From f02ec65590ef38444e80f595ebdbd211a25b4738 Mon Sep 17 00:00:00 2001
From: Richard Levitte <levitte@openssl.org>
Date: Mon, 24 Oct 2016 15:03:57 +0200
Subject: [PATCH] Fix the LIBZ macro on VC config targets

If zlib-dynamic was given but not --with-zlib-lib, LIBZ was defined to
the empty string.  Instead, give it the default "ZLIB1".

Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1772)
(cherry picked from commit 111b234c8f80371e7e31d922946cbd546491d4e8)
---
 Configurations/10-main.conf | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 99e435d40d..5c04009304 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1258,9 +1258,11 @@ sub vms_info {
         cflags           => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE",
         defines          => add(sub { my @defs = ();
                                       unless ($disabled{"zlib-dynamic"}) {
+                                          my $zlib =
+                                              $withargs{zlib_lib} // "ZLIB1";
                                           push @defs,
                                               quotify("perl",
-                                                      'LIBZ="' . $withargs{zlib_lib} . '"');
+                                                      'LIBZ="' . $zlib . '"');
                                       }
                                       return [ @defs ];
                                     }),
-- 
2.25.1