This part fixes braces around if-else.

[openssl.git] / Configure

diff --git a/Configure b/Configure
index ada1472b247abff3e421a7b73ac6febd4e43977b..60dc1f4bf033a3c654538430c5ec81f736fbe202 100755 (executable)
--- a/Configure
+++ b/Configure
@@ -17,7 +17,7 @@ use lib "$FindBin::Bin/util/perl";
 use File::Basename;
 use File::Spec::Functions qw/:DEFAULT abs2rel rel2abs/;
 use File::Path qw/mkpath/;
-use if $^O ne "VMS", 'File::Glob' => qw/:bsd_glob/;
+use OpenSSL::Glob;
 
 # see INSTALL for instructions.
 
@@ -1323,8 +1323,8 @@ if (defined($config{api})) {
 if ($strict_warnings)
        {
        my $wopt;
-       die "ERROR --strict-warnings requires gcc or clang"
-            unless $ecc eq 'gcc' || $ecc eq 'clang';
+       die "ERROR --strict-warnings requires gcc, clang or icc"
+            unless $ecc eq 'gcc' || $ecc eq 'clang' || $ecc eq 'icc';
        foreach $wopt (split /\s+/, $gcc_devteam_warn)
                {
                $config{cflags} .= " $wopt" unless ($config{cflags} =~ /(?:^|\s)$wopt(?:\s|$)/)