diff options
author | Dr. Stephen Henson <steve@openssl.org> | 2009-04-23 16:32:42 +0000 |
---|---|---|
committer | Dr. Stephen Henson <steve@openssl.org> | 2009-04-23 16:32:42 +0000 |
commit | ef236ec3b26300c0a18872c432122a74f9d5459e (patch) | |
tree | eeaaa927765ca06f61c1b559b3fff5263a6b5654 /Configure | |
parent | 8711efb4984b66a901b543d1b5d96fc5b6928d10 (diff) |
Merge from 1.0.0-stable branch.
Diffstat (limited to 'Configure')
-rwxr-xr-x | Configure | 8 |
1 files changed, 7 insertions, 1 deletions
@@ -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/; |