[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  25004db793dc737d5cc858fc35c69da3d4bfb9aa (commit)
      from  5f57abe2b150139b8b057313d52b1fe8f126c952 (commit)


- Log -----------------------------------------------------------------
commit 25004db793dc737d5cc858fc35c69da3d4bfb9aa
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Mar 3 10:07:29 2016 +0100

    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 at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/Configure b/Configure
index 28339f1..5e2e8d3 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};