summaryrefslogtreecommitdiffstats
path: root/Configure
diff options
context:
space:
mode:
authorBernd Edlinger <bernd.edlinger@hotmail.de>2018-04-15 12:02:25 +0200
committerBernd Edlinger <bernd.edlinger@hotmail.de>2018-04-17 16:33:15 +0200
commitdbabc862966b9afbcc55c59cc07ab643a14ffb31 (patch)
tree85d5a843d9d259a32be3d87b5bcde50b97ba64bb /Configure
parenta051af0e75bf717cc818db498d9b977953816f80 (diff)
Add a config option to disable automatic config loading
./config no-autoload-config Reviewed-by: Rich Salz <rsalz@openssl.org> (Merged from https://github.com/openssl/openssl/pull/5959)
Diffstat (limited to 'Configure')
-rwxr-xr-xConfigure3
1 files changed, 2 insertions, 1 deletions
diff --git a/Configure b/Configure
index 99ab26f4a7..5703302f6c 100755
--- a/Configure
+++ b/Configure
@@ -325,6 +325,7 @@ my @disablables = (
"async",
"autoalginit",
"autoerrinit",
+ "autoload-config",
"bf",
"blake2",
"camellia",
@@ -426,7 +427,7 @@ my %deprecated_disablables = (
# All of the following are disabled by default:
our %disabled = ( # "what" => "comment"
- "asan" => "default",
+ "asan" => "default",
"crypto-mdebug" => "default",
"crypto-mdebug-backtrace" => "default",
"devcryptoeng" => "default",