Configure: pick up options from older 'config'

These options were coded in util/perl/OpenSSL/config.pm, but that got
removed when the OpenSSL::config::main() function was removed.  We're
not putting them back, but in 'Configure'.

Reviewed-by: Tim Hudson <tjh@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/11230)

diff --git a/Configure b/Configure
index 43e4a5f6f84abff3c9381c6d771ba6cd0eed2312..5bd7abca92d8a397a70f5e39e8b5e7e682c3ef4d 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -205,6 +205,11 @@ my $apitable = {
     "0.9.8" =>   908,
 };
 
+# For OpenSSL::config::get_platform
+my %guess_opts = ();
+
+my $dryrun = 0;
+
 our %table = ();
 our %config = ();
 our %withargs = ();
@@ -834,6 +839,22 @@ while (@argvcopy)
                 # No longer an automatic choice
                 $auto_threads = 0 if ($1 eq "threads");
                 }
+        elsif (/^-d$/)          # From older 'config'
+                {
+                $config{build_type} = "debug";
+                }
+        elsif (/^-v$/)          # From older 'config'
+                {
+                $guess_opts{verbose} = 1;
+                }
+        elsif (/^-w$/)          # From older 'config'
+                {
+                $guess_opts{nowait} = 1;
+                }
+        elsif (/^-t$/)          # From older 'config'
+                {
+                $dryrun = 1;
+                }
         elsif (/^--strict-warnings$/)
                 {
                 # Pretend that our strict flags is a C flag, and replace it
@@ -1069,7 +1090,7 @@ if (grep { /-rpath\b/ } ($user{LDFLAGS} ? @{$user{LDFLAGS}} : ())
 
 # If no target was given, try guessing.
 unless ($target) {
-    my %system_config = OpenSSL::config::get_platform(%config, %user);
+    my %system_config = OpenSSL::config::get_platform(%guess_opts, %user);
 
     # The $system_config{disable} is used to populate %disabled with
     # entries that aren't already there.
@@ -1201,6 +1222,8 @@ if ($target) {
 
 &usage unless $target;
 
+exit 0 if $dryrun;              # From older 'config'
+
 $config{target} = $target;
 my %target = resolve_config($target);