From: Richard Levitte <levitte@openssl.org>
Date: Mon, 22 Feb 2016 13:04:45 +0000 (+0100)
Subject: Clean away $zlib since with have $disabled{zlib}
X-Git-Tag: OpenSSL_1_1_0-pre4~554
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=36a3090904877cde2a793488b8ef640c9d803fbd;p=openssl

Clean away $zlib since with have $disabled{zlib}

Reviewed-by: Rich Salz <rsalz@openssl.org>
---

diff --git a/Configure b/Configure
index 718c172a85..680b5a3d3f 100755
--- a/Configure
+++ b/Configure
@@ -209,7 +209,6 @@ $config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
 my $nofipscanistercheck=0;
 $config{baseaddr}="0xFB00000";
 my $threads=0;
-my $zlib=1;      # but "no-zlib" is default
 my $no_rfc3779=0;
 my $no_asm=0;
 my $no_dso=0;
@@ -786,7 +785,7 @@ foreach (sort (keys %disabled))
 	elsif (/^pic$/)
 		{ }
 	elsif (/^zlib$/)
-		{ $zlib = 0; }
+		{ }
 	elsif (/^dynamic-engine$/)
 		{ }
 	elsif (/^zlib-dynamic$/)
@@ -994,7 +993,7 @@ if ($threads)
 	push @{$config{openssl_thread_defines}}, @thread_defines;
 	}
 
-if ($zlib)
+unless ($disabled{zlib})
 	{
 	push @{$config{defines}}, "ZLIB";
 	if (defined($disabled{"zlib-dynamic"}))