diff options
author | Richard Levitte <levitte@openssl.org> | 2016-02-27 11:37:33 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-02 19:15:42 +0100 |
commit | 98fdbce09144a8addc6682a0ffd8ac92b2ce70b1 (patch) | |
tree | 35c5da21605d51543ea872ea5a7237e375f17fdf /Configure | |
parent | d2b2221a04053578911d34a45026543e4c39ce0c (diff) |
Configure - move the addition of the zlib / libz lib to configs
Configure had the Unix centric addition of -lz when linking with zlib
is enabled, which doesn't work on other platforms. Therefore, we move
it to the BASE_unix config template and add corresponding ones in the
other BASE_* config templates. The Windows one is probably incomplete,
but that doesn't matter for the moment, as mk1mf does it's own thing
anyway.
This required making the %withargs table global, so perl snippets in
the configs can use it.
Reviewed-by: Andy Polyakov <appro@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 22 |
1 files changed, 1 insertions, 21 deletions
@@ -138,6 +138,7 @@ my $apitable = { our %table = (); our %config = (); +our %withargs = (); # Forward declarations ############################################### @@ -437,7 +438,6 @@ $config{openssl_other_defines}=[]; my $libs=""; my $target=""; $config{options}=""; -my %withargs=(); my $build_prefix = "release_"; my @argvcopy=@ARGV; @@ -980,26 +980,6 @@ if ($threads) push @{$config{openssl_thread_defines}}, @thread_defines; } -unless ($disabled{zlib}) - { - push @{$config{defines}}, "ZLIB"; - if (defined($disabled{"zlib-dynamic"})) - { - if (defined($withargs{zlib_lib})) - { - $config{ex_libs} .= " -L" . $withargs{zlib_lib} . " -lz"; - } - else - { - $config{ex_libs} .= " -lz"; - } - } - else - { - push @{$config{defines}}, "ZLIB_SHARED"; - } - } - # With "deprecated" disable all deprecated features. if (defined($disabled{"deprecated"})) { $config{api} = $maxapi; |