summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2019-09-13 10:45:29 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2019-09-16 18:23:20 +0200
commit3b2f8c771a1babbe223c9f1ca76fbc9dec5f915f (patch)
tree830f15b249465769b3b2009a44b96abe1ca35510 /Configure
parent1aa89a7a3afb053d0c0b7fad8d3ea1b0a5447289 (diff)
Fix building statically without any dso support
Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/9895)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure5
1 files changed, 3 insertions, 2 deletions
diff --git a/Configure b/Configure
index 92c9d4e4d9..4415e1d6bc 100755
--- a/Configure
+++ b/Configure
@@ -350,6 +350,7 @@ my @disablables = (
"dgram",
"dh",
"dsa",
+ "dso",
"dtls",
"dynamic-engine",
"ec",
@@ -442,7 +443,6 @@ my %deprecated_disablables = (
"hw-padlock" => "padlockeng",
"ripemd" => "rmd160",
"ui" => "ui-console",
- "dso" => undef,
"heartbeats" => undef,
);
@@ -510,6 +510,7 @@ my @disable_cascades = (
# (note that even with shared libraries, both the app and dynamic engines
# must be linked with the same library)
"shared" => [ "dynamic-engine", "uplink" ],
+ "dso" => [ "dynamic-engine", "module" ],
# Other modules don't necessarily have to link with libcrypto, so shared
# libraries do not have to be a condition to produce those.
@@ -1239,7 +1240,7 @@ foreach my $what (sort keys %disabled) {
$skipdir{engines} = $what if $what eq 'engine';
$skipdir{"crypto/$skipdir"} = $what
- unless $what eq 'async' || $what eq 'err';
+ unless $what eq 'async' || $what eq 'err' || $what eq 'dso';
}
}