Merge from 1.0.0-stable branch.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index 8f9f2ded4a78511347f6f483c9f60dd863a3c06a..c3ebcda3f4b5c6b341b1cd1308dc1a9d9a5f5a5d 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -573,7 +573,7 @@ my %table=(
 
 my @MK1MF_Builds=qw(VC-WIN64I VC-WIN64A
                    VC-NT VC-CE VC-WIN32
-                   BC-32 OS2-EMX
+                   BC-32 
                    netware-clib netware-clib-bsdsock
                    netware-libc netware-libc-bsdsock);
 
@@ -918,6 +918,11 @@ if (defined($disabled{"tls1"}))
        $disabled{"tlsext"} = "forced";
        }
 
+if (defined($disabled{"ec"}))
+       {
+       $disabled{"gost"} = "forced";
+       }
+
 if ($target eq "TABLE") {
        foreach $target (sort keys %table) {
                print_table_entry($target);
@@ -1432,6 +1437,7 @@ while (<IN>)
                }
        $sdirs = 0 unless /\\$/;
         s/engines // if (/^DIRS=/ && $disabled{"engine"});
+       s/ccgost// if (/^ENGDIRS=/ && $disabled{"gost"});
        s/^VERSION=.*/VERSION=$version/;
        s/^MAJOR=.*/MAJOR=$major/;
        s/^MINOR=.*/MINOR=$minor/;