Fix zlib configuration options.
authorRichard Levitte <levitte@openssl.org>
Tue, 12 Apr 2016 13:28:06 +0000 (15:28 +0200)
committerRichard Levitte <levitte@openssl.org>
Wed, 13 Apr 2016 09:36:46 +0000 (11:36 +0200)
commit62890f47288687e4f0b7b2c1ce2da7c93ef21063
treec38441f5b22fb899843988b3f1709552e40c1d5e
parent36d70ed51968adf9b2e7d7c67368aaccda7eabfe
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>
Configurations/00-base-templates.conf
Configurations/10-main.conf