Commit 25004db7 authored by Richard Levitte's avatar Richard Levitte
Browse files

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: default avatarRich Salz <rsalz@openssl.org>
parent 5f57abe2

Configure

+5 −0
Original line number Diff line number Diff line
@@ -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};