From: Richard Levitte <levitte@openssl.org>
Date: Sun, 22 Jul 2018 08:56:25 +0000 (+0200)
Subject: Configure: Display error/warning on deprecated/unsupported options after loop
X-Git-Tag: OpenSSL_1_1_0i~43
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=a0d893f9b403e2e435b39b4adf14ebffadd4ea89;p=oweals%2Fopenssl.git

Configure: Display error/warning on deprecated/unsupported options after loop

Fixes #6755

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

(cherry picked from commit ddbe700e93e34694519d303e1b4e4525184c9dad)
---

diff --git a/Configure b/Configure
index 7f073b6294..f819cab725 100755
--- a/Configure
+++ b/Configure
@@ -756,21 +756,21 @@ while (@argvcopy)
 		else
 			{ $config{options} .= " ".$_; }
 		}
+	}
 
-        if (defined($config{api}) && !exists $apitable->{$config{api}}) {
-		die "***** Unsupported api compatibility level: $config{api}\n",
-        }
+if (defined($config{api}) && !exists $apitable->{$config{api}}) {
+	die "***** Unsupported api compatibility level: $config{api}\n",
+}
 
-	if (keys %deprecated_options)
-		{
-		warn "***** Deprecated options: ",
-			join(", ", keys %deprecated_options), "\n";
-		}
-	if (keys %unsupported_options)
-		{
-		die "***** Unsupported options: ",
-			join(", ", keys %unsupported_options), "\n";
-		}
+if (keys %deprecated_options)
+	{
+	warn "***** Deprecated options: ",
+		join(", ", keys %deprecated_options), "\n";
+	}
+if (keys %unsupported_options)
+	{
+	die "***** Unsupported options: ",
+		join(", ", keys %unsupported_options), "\n";
 	}
 
 if ($libs =~ /(^|\s)-Wl,-rpath,/