From: Richard Levitte <levitte@openssl.org>
Date: Wed, 14 Sep 2016 20:21:41 +0000 (+0200)
Subject: Register the name of the config file each config target was found in
X-Git-Tag: OpenSSL_1_1_0a~48
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=efd23794121520fb1526616af2784ddc9d078280;p=oweals%2Fopenssl.git

Register the name of the config file each config target was found in

Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit ee9b0bbb4c66812da18939ea96c4625cb001f3bd)
---

diff --git a/Configure b/Configure
index 9c183daaeb..f2dde798ef 100755
--- a/Configure
+++ b/Configure
@@ -904,6 +904,8 @@ my %target = resolve_config($target);
 
 &usage if (!%target || $target{template});
 
+my %conf_files = map { $_ => 1 } (@{$target{_conf_fname_int}});
+$config{conf_files} = [ sort keys %conf_files ];
 %target = ( %{$table{DEFAULTS}}, %target );
 
 $target{exe_extension}="";
@@ -2225,7 +2227,8 @@ sub read_config {
     close(CONFFILE);
     my %targets = ();
     {
-	local %table = %::table;    # Protect %table from tampering
+	# Protect certain tables from tampering
+	local %table = %::table;
 
 	eval $content;
 	warn $@ if $@;
@@ -2240,7 +2243,9 @@ sub read_config {
 		warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";
 	    }
 	    delete $targets{$_};
-	}
+	} else {
+            $targets{$_}->{_conf_fname_int} = add([ $fname ]);
+        }
     }
 
     %table = (%table, %targets);