From 34da11b39d2421f546ec568f355875eec353844c Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 15 Apr 2016 09:17:13 +0200 Subject: [PATCH] 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 --- Configurations/00-base-templates.conf | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 (); }, -- 2.25.1