projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
ef5b829
)
Don't use a default for --with-zlib-lib on Windows with option 'zlib'
author
Richard Levitte
<levitte@openssl.org>
Fri, 15 Apr 2016 07:17:13 +0000
(09:17 +0200)
committer
Richard Levitte
<levitte@openssl.org>
Fri, 15 Apr 2016 07:17:13 +0000
(09:17 +0200)
To begin with, the default should have been the import library, not
the DLL itself. However, we don't know what directory it's installed
in either way, so we may as well demand the full path from the user
Reviewed-by: Matt Caswell <matt@openssl.org>
Configurations/00-base-templates.conf
patch
|
blob
|
history
diff --git
a/Configurations/00-base-templates.conf
b/Configurations/00-base-templates.conf
index 0211a8c936f888c5dd07952e109c0a9348f3b380..c28e4e1b515e3b23ff28f21e728299270573b17c 100644
(file)
--- a/
Configurations/00-base-templates.conf
+++ b/
Configurations/00-base-templates.conf
@@
-80,7
+80,7
@@
sub {
unless ($disabled{zlib}) {
if (defined($disabled{"zlib-dynamic"})) {
- return $withargs{zlib_lib}
|| "zlib1.lib"
;
+ return $withargs{zlib_lib};
}
}
return (); },