diff options
author | Richard Levitte <levitte@openssl.org> | 2016-03-09 09:04:01 +0100 |
---|---|---|
committer | Richard Levitte <levitte@openssl.org> | 2016-03-09 12:51:07 +0100 |
commit | 79fff39d71708c5dffa205045767d7bc522da789 (patch) | |
tree | 87a53ecac452f20fa0225f9104b7f7f55cb70e8d | |
parent | 63ee7129f1e034b4befd4706dc9ab471fc525e73 (diff) | |
download | openssl-79fff39d71708c5dffa205045767d7bc522da789.tar.gz |
Don't check the conditions to build e_afalg if configured "no-engine"
Reviewed-by: Matt Caswell <matt@openssl.org>
-rwxr-xr-x | Configure | 30 |
1 files changed, 16 insertions, 14 deletions
@@ -1193,22 +1193,24 @@ else { $no_user_defines=1; } # ALL MODIFICATIONS TO %config and %target MUST BE DONE FROM HERE ON -$config{afalg}=""; -if ($target =~ m/^linux/) { - my $minver = 4*10000 + 1*100 + 0; - if ($config{cross_compile_prefix} eq "") { - my $verstr = `uname -r`; - my ($ma, $mi1, $mi2) = split("\\.", $verstr); - ($mi2) = $mi2 =~ /(\d+)/; - my $ver = $ma*10000 + $mi1*100 + $mi2; - if ($ver < $minver) { - $disabled{afalg} = "too-old-kernel"; - } else { - push @{$config{engdirs}}, "afalg"; +unless ($disabled{engine}) { + $config{afalg}=""; + if ($target =~ m/^linux/) { + my $minver = 4*10000 + 1*100 + 0; + if ($config{cross_compile_prefix} eq "") { + my $verstr = `uname -r`; + my ($ma, $mi1, $mi2) = split("\\.", $verstr); + ($mi2) = $mi2 =~ /(\d+)/; + my $ver = $ma*10000 + $mi1*100 + $mi2; + if ($ver < $minver) { + $disabled{afalg} = "too-old-kernel"; + } else { + push @{$config{engdirs}}, "afalg"; + } } + } else { + $disabled{afalg} = "not-linux"; } -} else { - $disabled{afalg} = "not-linux"; } push @{$config{openssl_other_defines}}, "OPENSSL_NO_AFALGENG" if ($disabled{afalg}); |