Merge from 1.0.0-stable branch.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index e046673ca5218d3ebd3ad841b4619a1c9cc1ded9..ba60a515241200daa9bd389089fc725ba94bee5f 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -658,6 +658,7 @@ my %disabled = ( # "what"         => "comment" [or special keyword "experimental
                  "rc5"            => "default",
                 "rfc3779"        => "default",
                  "shared"         => "default",
+                "store"          => "experimental",
                  "zlib"           => "default",
                  "zlib-dynamic"   => "default"
                );
@@ -665,7 +666,7 @@ my @experimental = ();
 
 # This is what $depflags will look like with the above defaults
 # (we need this to see if we should advise the user to run "make depend"):
-my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779";
+my $default_depflags = " -DOPENSSL_NO_GMP -DOPENSSL_NO_JPAKE -DOPENSSL_NO_MDC2 -DOPENSSL_NO_RC5 -DOPENSSL_NO_RFC3779 -DOPENSSL_NO_STORE";
 
 
 # Explicit "no-..." options will be collected in %disabled along with the defaults.
@@ -1423,6 +1424,7 @@ while (<IN>)
                        }
                }
        $sdirs = 0 unless /\\$/;
+        s/engines // if (/^DIRS=/ && $disabled{"engine"});
        s/^VERSION=.*/VERSION=$version/;
        s/^MAJOR=.*/MAJOR=$major/;
        s/^MINOR=.*/MINOR=$minor/;