Replace the message about configdata.pm as a script
authorRichard Levitte <levitte@openssl.org>
Fri, 2 Feb 2018 11:30:50 +0000 (12:30 +0100)
committerRichard Levitte <levitte@openssl.org>
Thu, 22 Feb 2018 13:57:40 +0000 (14:57 +0100)
The new message is geared toward issue reports

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

Configure

index fb0534a7d79f422947b08794b08a913a74bbaadd..3c40a0e25e16de41d7424a93fe3fb1597de91319 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -2603,17 +2603,6 @@ 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
@@ -2638,6 +2627,18 @@ safest course of action is to clean the source directory and redo this
 configuration.
 EOF
 
+print <<"EOF";
+
+**********************************************************************
+***                                                                ***
+***   If you want to report a building issue, please include the   ***
+***   output from this command:                                    ***
+***                                                                ***
+***     perl configdata.pm --dump                                  ***
+***                                                                ***
+**********************************************************************
+EOF
+
 exit(0);
 
 ######################################################################