diff options
author | Richard Levitte <levitte@openssl.org> | 2016-03-03 10:07:29 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-04 05:22:22 +0100 |
commit | 25004db793dc737d5cc858fc35c69da3d4bfb9aa (patch) | |
tree | b0d4796f36ec0bf556059f8d97caec4590f267b9 /Configure | |
parent | 5f57abe2b150139b8b057313d52b1fe8f126c952 (diff) |
Restore the zlib / zlib-dynamic logic
The proper logic is that both zlib and zlib-dynamic are disabled by
default and that enabling zlib-dynamic would enable zlib. Somewhere
along the way, the logic got changed, zlib-dynamic was enabled by
default and zlib didn't get automatically enabled.
This change restores the original logic.
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 5 |
1 files changed, 5 insertions, 0 deletions
@@ -339,6 +339,7 @@ our %disabled = ( # "what" => "comment" "static-engine" => "default", "unit-test" => "default", "zlib" => "default", + "zlib-dynamic" => "default", "crypto-mdebug" => "default", "heartbeats" => "default", ); @@ -582,6 +583,10 @@ foreach (@argvcopy) { delete $disabled{"dynamic-engine"}; } + elsif ($1 eq "zlib-dynamic") + { + delete $disabled{"zlib"}; + } my $algo = $1; delete $disabled{$algo}; |