Clean away $no_rfc3779 since we don't appear to use it at all

[openssl.git] / Configure

diff --git a/Configure b/Configure
index df492a2fb7730abad3387557f17c0acf65469c3f..ba3d844a15efb9137861d56843883ea38d991873 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -208,11 +208,7 @@ $config{cross_compile_prefix}="";
 $config{fipslibdir}="/usr/local/ssl/fips-2.0/lib/";
 my $nofipscanistercheck=0;
 $config{baseaddr}="0xFB00000";
-my $no_threads=0;
 my $threads=0;
-$config{no_shared}=0; # but "no-shared" is default
-my $zlib=1;      # but "no-zlib" is default
-my $no_rfc3779=0;
 my $no_asm=0;
 my $no_dso=0;
 my $default_ranlib;
@@ -782,13 +778,13 @@ foreach (sort (keys %disabled))
        if (/^dso$/)
                { $no_dso = 1; }
        elsif (/^threads$/)
-               { $no_threads = 1; }
+               { }
        elsif (/^shared$/)
-               { $config{no_shared} = 1; }
+               { }
        elsif (/^pic$/)
                { }
        elsif (/^zlib$/)
-               { $zlib = 0; }
+               { }
        elsif (/^dynamic-engine$/)
                { }
        elsif (/^zlib-dynamic$/)
@@ -957,7 +953,7 @@ if (!$no_dso && $target{dso_scheme} ne "")
 
 my $thread_cflags = "";
 my @thread_defines;
-if ($target{thread_cflag} ne "(unknown)" && !$no_threads)
+if ($target{thread_cflag} ne "(unknown)" && !$disabled{threads})
        {
        # If we know how to do it, support threads by default.
        $threads = 1;
@@ -996,7 +992,7 @@ if ($threads)
        push @{$config{openssl_thread_defines}}, @thread_defines;
        }
 
-if ($zlib)
+unless ($disabled{zlib})
        {
        push @{$config{defines}}, "ZLIB";
        if (defined($disabled{"zlib-dynamic"}))
@@ -1024,9 +1020,9 @@ if (defined($disabled{"deprecated"})) {
 if ($target{shared_target} eq "")
        {
        $no_shared_warn = 1
-           if ((!$config{no_shared} || !$disabled{"dynamic-engine"})
+           if ((!$disabled{shared} || !$disabled{"dynamic-engine"})
                && !$config{fips});
-       $config{no_shared} = 1;
+       $disabled{shared} = "no-shared-target";
        $disabled{pic} = $disabled{shared} = $disabled{"dynamic-engine"} =
            "no-shared-target";
        }
@@ -1447,7 +1443,7 @@ EOF
 
         push @{$unified_info{rawlines}}, @rawlines;
 
-        if (!$config{no_shared}) {
+        unless ($disabled{shared}) {
             # Check sharednames.
             foreach (keys %sharednames) {
                 my $dest = cleanfile($buildd, $_, $blddir);
@@ -1876,7 +1872,7 @@ print <<"EOF";
 Configured for $target.
 EOF
 
-print <<"EOF" if (!$no_threads && !$threads);
+print <<"EOF" if (!$disabled{threads} && !$threads);
 
 The library could not be configured for supporting multi-threaded
 applications as the compiler options required on this system are not known.