[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  cb212f239a51da19952609991d3cb20172231dee (commit)
      from  d3c02d844abeaf961bad692cf6f3876ccabf2435 (commit)


- Log -----------------------------------------------------------------
commit cb212f239a51da19952609991d3cb20172231dee
Author: Richard Levitte <levitte at openssl.org>
Date:   Wed Feb 24 01:32:51 2016 +0100

    Make the table entry printer in Configure aware of ARRAYs
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>

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

Summary of changes:
 Configure | 14 ++++++++++++--
 1 file changed, 12 insertions(+), 2 deletions(-)

diff --git a/Configure b/Configure
index 06e1967..b1985ea 100755
--- a/Configure
+++ b/Configure
@@ -2238,14 +2238,24 @@ sub print_table_entry
     if ($type eq "TABLE") {
 	print "\n";
 	print "*** $target\n";
-	printf "\$%-12s = %s\n", $_, $target{$_} foreach (@sequence);
+        foreach (@sequence) {
+            if (ref($target{$_}) eq "ARRAY") {
+                printf "\$%-12s = %s\n", $_, join(" ", @{$target{$_}});
+            } else {
+                printf "\$%-12s = %s\n", $_, $target{$_};
+            }
+        }
     } elsif ($type eq "HASH") {
 	my $largest =
 	    length((sort { length($a) <=> length($b) } @sequence)[-1]);
 	print "    '$target' => {\n";
 	foreach (@sequence) {
 	    if ($target{$_}) {
-		print "      '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
+                if (ref($target{$_}) eq "ARRAY") {
+                    print "      '",$_,"'"," " x ($largest - length($_))," => [ ",join(", ", map { "'$_'" } @{$target{$_}})," ],\n";
+                } else {
+                    print "      '",$_,"'"," " x ($largest - length($_))," => '",$target{$_},"',\n";
+                }
 	    }
 	}
 	print "    },\n";