X-Git-Url: https://git.librecmc.org/?a=blobdiff_plain;f=Configure;h=c53c316e2d82ea848020138c134211e5184ded63;hb=f4da39d200a8c2068595b8d5bd5efb78af4224e1;hp=d8ea689d704f2029d6e0adfd265f2cd6c725ea0f;hpb=8b527be2db48064673640dda2d57edc6b362ae64;p=oweals%2Fopenssl.git

diff --git a/Configure b/Configure
index d8ea689d70..c53c316e2d 100755
--- a/Configure
+++ b/Configure
@@ -947,6 +947,7 @@ while($argv_unprocessed)
 	$argvstring=join(' ',@argvcopy);
 
 PROCESS_ARGS:
+	my %unsupported_options = ();
 	foreach (@argvcopy)
 		{
 		s /^-no-/no-/; # some people just can't read the instructions
@@ -963,7 +964,7 @@ PROCESS_ARGS:
 			my $word = $2;
 			if (!grep { $word =~ /^${_}$/ } @disablables)
 				{
-				warn "Unsupported option ${word}, ignored...\n";
+				$unsupported_options{$_} = 1;
 				next;
 				}
 			}
@@ -1135,6 +1136,12 @@ PROCESS_ARGS:
 				{ $options .= " ".$_; }
 			}
 		}
+
+	if (keys %unsupported_options)
+		{
+		die "***** Unsupported options: ",
+			join(", ", keys %unsupported_options), "\n";
+		}
 	}
 
 
@@ -1733,13 +1740,13 @@ if ($strict_warnings)
 	die "ERROR --strict-warnings requires gcc or clang" unless ($ecc =~ /gcc(-\d(\.\d)*)?$/ or $ecc =~ /clang$/);
 	foreach $wopt (split /\s+/, $gcc_devteam_warn)
 		{
-		$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
+		$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
 		}
 	if ($ecc eq "clang")
 		{
 		foreach $wopt (split /\s+/, $clang_devteam_warn)
 			{
-			$cflags .= " $wopt" unless ($cflags =~ /$wopt/)
+			$cflags .= " $wopt" unless ($cflags =~ /(^|\s)$wopt(\s|$)/)
 			}
 		}
 	}