summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2018-03-23 01:02:08 +0100
committerRichard Levitte <levitte@openssl.org>2018-03-23 01:02:08 +0100
commitc45bf277a1522a2eef94904f1c8ae18237c49a01 (patch)
tree9c226bf23a5a65615dfeda68de4457385e9b44fc /Configure
parent29f3cfddabfe448e9f5417ea228a99bb5e991017 (diff)
Move the handling of dso_scheme to dso_conf.h
The macros resulting from the dso_scheme attribute were defined for libraries only, but there's a test program that uses the macros as well. The easier way is to move the handling of this macro to crypto/include/internal/dso_conf.h and having the modules that need it include it. Reviewed-by: Andy Polyakov <appro@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5733)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure23
1 files changed, 0 insertions, 23 deletions
diff --git a/Configure b/Configure
index ce33f488d6..7a2ef9bae4 100755
--- a/Configure
+++ b/Configure
@@ -1232,29 +1232,6 @@ if ($target =~ /linux.*-mips/ && !$disabled{asm}
unshift @{$config{cxxflags}}, $value if $config{CXX};
}
-# The DSO code currently always implements all functions so that no
-# applications will have to worry about that from a compilation point
-# of view. However, the "method"s may return zero unless that platform
-# has support compiled in for them. Currently each method is enabled
-# by a define "DSO_<name>" ... we translate the "dso_scheme" config
-# string entry into using the following logic;
-if (!$disabled{dso} && $target{dso_scheme} ne "")
- {
- $target{dso_scheme} =~ tr/[a-z]/[A-Z]/;
- if ($target{dso_scheme} eq "DLFCN")
- {
- unshift @{$config{lib_defines}}, "DSO_DLFCN", "HAVE_DLFCN_H";
- }
- elsif ($target{dso_scheme} eq "DLFCN_NO_H")
- {
- unshift @{$config{lib_defines}}, "DSO_DLFCN";
- }
- else
- {
- unshift @{$config{lib_defines}}, "DSO_$target{dso_scheme}";
- }
- }
-
# If threads aren't disabled, check how possible they are
unless ($disabled{threads}) {
if ($auto_threads) {