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>

diff --git a/Configure b/Configure
index 28339f1daec387c841e3567800b0ff3eed7cc764..5e2e8d38dc71198c7feb5b8f4d1146fb331b0e61 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -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};