From 475592e2419c5cb3098dfea4c9229d0c09ea7010 Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Mon, 24 Oct 2016 15:11:29 +0200 Subject: [PATCH] Windows: use default ZLIB1 unless --with-zlib-lib is set Reviewed-by: Andy Polyakov (Merged from https://github.com/openssl/openssl/pull/1772) --- Configurations/00-base-templates.conf | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index ed50910eed..8c47e9e596 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", -- 2.34.1