summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-02-22 14:12:35 +0100
committerRichard Levitte <levitte@openssl.org>2016-02-22 16:37:46 +0100
commit721f9058b398f05611c1d5ac4ff7cc464695dd1e (patch)
treefccf18351b07bad3dce35926802e001477b0e567 /Configure
parent00b0d6632bd4c0af84dc4e9e66d17a989ad58d00 (diff)
Clean away $no_dso since with have $disabled{dso}
Reviewed-by: Rich Salz <rsalz@openssl.org>
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure5
1 files changed, 2 insertions, 3 deletions
diff --git a/Configure b/Configure
index e4a95ad654..82086ed5a6 100755
--- a/Configure
+++ b/Configure
@@ -209,7 +209,6 @@ $config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
my $nofipscanistercheck=0;
$config{baseaddr}="0xFB00000";
my $threads=0;
-my $no_dso=0;
my $default_ranlib;
$config{fips}=0;
@@ -775,7 +774,7 @@ foreach (sort (keys %disabled))
printf " no-%-12s %-10s", $_, "[$disabled{$_}]";
if (/^dso$/)
- { $no_dso = 1; }
+ { }
elsif (/^threads$/)
{ }
elsif (/^shared$/)
@@ -930,7 +929,7 @@ my $no_user_defines=0;
# 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 (!$no_dso && $target{dso_scheme} ne "")
+if (!$disabled{dso} && $target{dso_scheme} ne "")
{
$target{dso_scheme} =~ tr/[a-z]/[A-Z]/;
if ($target{dso_scheme} eq "DLFCN")