From 820e414d2830f2a28cd6daf49251f52f75046f2f Mon Sep 17 00:00:00 2001 From: Richard Levitte Date: Fri, 2 Feb 2018 12:30:50 +0100 Subject: [PATCH] Replace the message about configdata.pm as a script The new message is geared toward issue reports Reviewed-by: Rich Salz (Merged from https://github.com/openssl/openssl/pull/5247) --- Configure | 23 ++++++++++++----------- 1 file changed, 12 insertions(+), 11 deletions(-) diff --git a/Configure b/Configure index fb0534a7d7..3c40a0e25e 100755 --- 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); ###################################################################### -- 2.25.1