From: Richard Levitte <levitte@openssl.org>
Date: Mon, 24 Oct 2016 13:03:57 +0000 (+0200)
Subject: Fix the LIBZ macro on VC config targets
X-Git-Tag: OpenSSL_1_1_1-pre1~3177
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=111b234c8f80371e7e31d922946cbd546491d4e8;p=oweals%2Fopenssl.git

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)
---

diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf
index 5d11d3f628..dd5085dba9 100644
--- a/Configurations/10-main.conf
+++ b/Configurations/10-main.conf
@@ -1277,9 +1277,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 ];
                                     }),