From: Richard Levitte <levitte@openssl.org>
Date: Thu, 3 Mar 2016 09:07:29 +0000 (+0100)
Subject: Restore the zlib / zlib-dynamic logic
X-Git-Tag: OpenSSL_1_1_0-pre4~374
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=25004db793dc737d5cc858fc35c69da3d4bfb9aa

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 28339f1dae..5e2e8d38dc 100755
--- 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};