diff options
author | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-09-13 10:45:29 +0200 |
---|---|---|
committer | Bernd Edlinger <bernd.edlinger@hotmail.de> | 2019-09-16 18:27:50 +0200 |
commit | 8dcd57461972dceaaf014b71d173d0a8758e7054 (patch) | |
tree | f0939929ffe028126811e81751e3b819f8d699c9 /Configure | |
parent | 94ae5d82833a534e05bb61feea9ad4a765fad502 (diff) |
Fix building statically without any dso support
Reviewed-by: Richard Levitte <levitte@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/9889)
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 5 |
1 files changed, 3 insertions, 2 deletions
@@ -346,6 +346,7 @@ my @disablables = ( "dgram", "dh", "dsa", + "dso", "dtls", "dynamic-engine", "ec", @@ -423,7 +424,6 @@ my %deprecated_disablables = ( "buf-freelists" => undef, "ripemd" => "rmd160", "ui" => "ui-console", - "dso" => "", # Empty string means we're silent about it ); # All of the following are disabled by default: @@ -480,6 +480,7 @@ my @disable_cascades = ( # Without position independent code, there can be no shared libraries or DSOs "pic" => [ "shared" ], "shared" => [ "dynamic-engine" ], + "dso" => [ "dynamic-engine" ], "engine" => [ "afalgeng", "devcryptoeng" ], # no-autoalginit is only useful when building non-shared @@ -1181,7 +1182,7 @@ foreach my $what (sort keys %disabled) { my $macro = $disabled_info{$what}->{macro} = "OPENSSL_NO_$WHAT"; if ((grep { $what eq $_ } @{$config{sdirs}}) - && $what ne 'async' && $what ne 'err') { + && $what ne 'async' && $what ne 'err' && $what ne 'dso') { @{$config{sdirs}} = grep { $what ne $_} @{$config{sdirs}}; $disabled_info{$what}->{skipped} = [ catdir('crypto', $what) ]; |