[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  635bd409b354a6444728bb4ddf07272cf58e1cc9 (commit)
      from  4a4e250c2ad187e0b078ca10b77ff00e69e5eca9 (commit)


- Log -----------------------------------------------------------------
commit 635bd409b354a6444728bb4ddf07272cf58e1cc9
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Mar 9 14:33:37 2016 +0100

    In build.info, an IF within a clause that's skipped over shouldn't apply
    
    If we find an IF within a clause that's skipped over, set it to be
    skipped as well.
    
    Reviewed-by: Matt Caswell <matt at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 Configure | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/Configure b/Configure
index f346178..57d8a5a 100755
--- a/Configure
+++ b/Configure
@@ -1333,7 +1333,13 @@ if ($builder eq "unified") {
                                                 $l1 =~ s/\\$//; $l1.$l2 }),
             # Info we're looking for
             qr/^\s*IF\[((?:\\.|[^\\\]])*)\]\s*$/
-            => sub { push @skip, !! $1; },
+            => sub {
+                if (! @skip || $skip[$#skip] >= 0) {
+                    push @skip, !! $1;
+                } else {
+                    push @skip, -1;
+                }
+            },
             qr/^\s*ELSIF\[((?:\\.|[^\\\]])*)\]\s*$/
             => sub { die "ELSIF out of scope" if ! @skip;
                      die "ELSIF following ELSE" if abs($skip[$#skip]) == 2;