diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-04-12 15:28:06 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-04-13 11:36:46 +0200 |
| commit | 62890f47288687e4f0b7b2c1ce2da7c93ef21063 (patch) | |
| tree | c38441f5b22fb899843988b3f1709552e40c1d5e /Configurations/00-base-templates.conf | |
| parent | 36d70ed51968adf9b2e7d7c67368aaccda7eabfe (diff) | |
Fix zlib configuration options.
The macros ZLIB and ZLIB_SHARED weren't appropriately defined,
deviating wrongly from how they worked in earlier OpenSSL versions.
So, restore it so that ZLIB is defined if configured "enable-zlib" and
so that ZLIB and ZLIB_SHARED are defined if configured
"enable-zlib-dynamic".
Additionally, correct the interpretation of the --with-zlib-lib value
on Windows and VMS, where it's used to indicate the actual zlib
zlib library file / logical name, as that can differ depending on zlib
version and packaging on those platforms.
Finally for Windows and VMS, we also define the macro LIBZ with that
file name / logical name when configured "zlib-dynamic", so the
compression unit can pick it up and use it.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'Configurations/00-base-templates.conf')
| -rw-r--r-- | Configurations/00-base-templates.conf | 31 |
1 files changed, 7 insertions, 24 deletions
diff --git a/Configurations/00-base-templates.conf b/Configurations/00-base-templates.conf index 5fe038cc02..0211a8c936 100644 --- a/Configurations/00-base-templates.conf +++ b/Configurations/00-base-templates.conf @@ -43,16 +43,12 @@ BASE_common => { template => 1, defines => - [ sub { - unless ($disabled{zlib}) { - if (defined($disabled{"zlib-dynamic"})) { - return "ZLIB"; - } else { - return "ZLIB_SHARED"; - } - } - return (); } - ], + sub { + my @defs = (); + push @defs, "ZLIB" unless $disabled{zlib}; + push @defs, "ZLIB_SHARED" unless $disabled{"zlib-dynamic"}; + return [ @defs ]; + }, }, BASE_unix => { @@ -84,7 +80,7 @@ sub { unless ($disabled{zlib}) { if (defined($disabled{"zlib-dynamic"})) { - return "zlib1.lib"; + return $withargs{zlib_lib} || "zlib1.lib"; } } return (); }, @@ -104,19 +100,6 @@ inherit_from => [ "BASE_common" ], template => 1, - ex_libs => - sub { - unless ($disabled{zlib}) { - if (defined($disabled{"zlib-dynamic"})) { - if (defined($withargs{zlib_lib})) { - return $withargs{zlib_lib}.'GNV$LIBZSHR.EXE/SHARED' - } else { - return 'GNV$LIBZSHR/SHARE'; - } - } - } - return (); }, - build_file => "descrip.mms", build_scheme => [ "unified", "VMS" ], }, |