aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-04-15 09:17:13 +0200
committerRichard Levitte <levitte@openssl.org>2016-04-15 09:17:13 +0200
commit34da11b39d2421f546ec568f355875eec353844c (patch)
tree7680f0e85c0ce9cc1af54b9efcc13e100afc36fc
parentef5b8296a1e29013281d655914fe1b778030fb01 (diff)
downloadopenssl-34da11b39d2421f546ec568f355875eec353844c.tar.gz
Don't use a default for --with-zlib-lib on Windows with option 'zlib'
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>
-rw-r--r--Configurations/00-base-templates.conf2
1 files changed, 1 insertions, 1 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf
index 0211a8c936..c28e4e1b51 100644
--- 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 (); },