提交 25004db7 编写于 作者: R Richard Levitte

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: NRich Salz <rsalz@openssl.org>
上级 5f57abe2
......@@ -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};
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册