diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-04-12 16:12:53 +0200 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-04-13 11:36:46 +0200 |
| commit | 5a5c0b953f8f97b4e604da494a65de034bbaaceb (patch) | |
| tree | 1efab2a23a5c94082c6ef3b8fce7eadf396db832 /Configurations | |
| parent | 0c9b1534265a59d099886fc916b859e55d268d8b (diff) | |
| download | openssl-5a5c0b953f8f97b4e604da494a65de034bbaaceb.zip openssl-5a5c0b953f8f97b4e604da494a65de034bbaaceb.tar.gz openssl-5a5c0b953f8f97b4e604da494a65de034bbaaceb.tar.bz2 | |
Remake the way dynamic zlib is loaded
Instead of absolute hard coding of the libz library name, have it use
the macro LIBZ, which is set to defaults we know in case it's
undefined.
This allows our configuration to set something that's sane on current
or older platforms, and allows the user to override it by defining
LIBZ themselves.
Reviewed-by: Matt Caswell <matt@openssl.org>
Diffstat (limited to 'Configurations')
| -rw-r--r-- | Configurations/10-main.conf | 8 |
1 files changed, 8 insertions, 0 deletions
diff --git a/Configurations/10-main.conf b/Configurations/10-main.conf index 8c6ee7f..5bf8a0d 100644 --- a/Configurations/10-main.conf +++ b/Configurations/10-main.conf @@ -1249,6 +1249,14 @@ sub vms_info { template => 1, cc => "cl", cflags => "-W3 -wd4090 -Gs0 -GF -Gy -nologo -DOPENSSL_SYS_WIN32 -DWIN32_LEAN_AND_MEAN -DL_ENDIAN -D_CRT_SECURE_NO_DEPRECATE", + defines => add(sub { my @defs = (); + unless ($disabled{"zlib-dynamic"}) { + push @defs, + quotify("perl", + 'LIBZ="' . $withargs{zlib_lib} . '"'); + } + return [ @defs ]; + }), coutflag => "/Fo", rc => "rc", rcoutflag => "/fo", |