wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Richard Levitte 2016-02-22 14:04:45 +01:00
parent 22bfe05efd
commit 36a3090904
1 changed files with 2 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
Configure
View file

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