diff options
| author | Richard Levitte <levitte@openssl.org> | 2016-02-22 14:04:45 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2016-02-22 16:37:46 +0100 |
| commit | 36a3090904877cde2a793488b8ef640c9d803fbd (patch) | |
| tree | eac9bcc1d553ee4c7b8f5722a44767c8a8aa7085 /Configure | |
| parent | 22bfe05efdda4239b200453b09ed0649319399a4 (diff) | |
Clean away $zlib since with have $disabled{zlib}
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
| -rwxr-xr-x | Configure | 5 |
1 files changed, 2 insertions, 3 deletions
@@ -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"})) |