From: Richard Levitte <levitte@openssl.org>
Date: Mon, 29 Jan 2018 17:33:32 +0000 (+0100)
Subject: To make it less surprising and confusing, leave a message on configdata.pm
X-Git-Tag: OpenSSL_1_1_1-pre1~97
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=7187f0e1ea22e63454ec46f128d669acf1128a8f;p=oweals%2Fopenssl.git

To make it less surprising and confusing, leave a message on configdata.pm

This message will ONLY be visible in OpenSSL 1.1.1, it will not show
in 1.1.1a or any other release or update.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/5185)
---

diff --git a/Configure b/Configure
index dd0017836d..8410e42c62 100755
--- a/Configure
+++ b/Configure
@@ -2554,6 +2554,17 @@ my %builders = (
 
 $builders{$builder}->($builder_platform, @builder_opts);
 
+# Show a note on the use of configdata.pm, but ONLY for release 1.1.1
+# (i.e. this message disappears with the following update, 1.1.1a)
+print <<"EOF" if ($config{version_num} =~ m|^0x1010100.L$|);
+
+NOTE: Starting with OpenSSL 1.1.1, 'Configure' doesn't display all the disabled
+options or the "make variables" with their values.  Instead, you must use
+'configdata.pm' as a script to get a display of the configuration data.  For
+help, please do this:
+
+        perl configdata.pm --help
+EOF
 print <<"EOF" if ($disabled{threads} eq "unavailable");
 
 The library could not be configured for supporting multi-threaded