projects
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
111b234
)
Windows: use default ZLIB1 unless --with-zlib-lib is set
author
Richard Levitte
<levitte@openssl.org>
Mon, 24 Oct 2016 13:11:29 +0000
(15:11 +0200)
committer
Richard Levitte
<levitte@openssl.org>
Sun, 6 Nov 2016 21:54:08 +0000
(22:54 +0100)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/1772)
Configurations/00-base-templates.conf
patch
|
blob
|
history
diff --git
a/Configurations/00-base-templates.conf
b/Configurations/00-base-templates.conf
index ed50910eeddc7b570a2f348b430bc54780b67c11..8c47e9e596e87b64f7b02b7331bac65b98ceca8b 100644
(file)
--- 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",