Don't use a default for --with-zlib-lib on Windows with option 'zlib'
authorRichard Levitte <levitte@openssl.org>
Fri, 15 Apr 2016 07:17:13 +0000 (09:17 +0200)
committerRichard 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

index 0211a8c..c28e4e1 100644 (file)
@@ -80,7 +80,7 @@
             sub {
                 unless ($disabled{zlib}) {
                     if (defined($disabled{"zlib-dynamic"})) {
-                        return $withargs{zlib_lib} || "zlib1.lib";
+                        return $withargs{zlib_lib};
                     }
                 }
                 return (); },