Clean away $zlib since with have $disabled{zlib}
authorRichard Levitte <levitte@openssl.org>
Mon, 22 Feb 2016 13:04:45 +0000 (14:04 +0100)
committerRichard Levitte <levitte@openssl.org>
Mon, 22 Feb 2016 15:37:46 +0000 (16:37 +0100)
Reviewed-by: Rich Salz <rsalz@openssl.org>
Configure

index 718c172..680b5a3 100755 (executable)
--- 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"}))