summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2016-09-14 22:21:41 +0200
committerRichard Levitte <levitte@openssl.org>2016-09-16 11:52:50 +0200
commitee9b0bbb4c66812da18939ea96c4625cb001f3bd (patch)
tree17da64274c6b7f7510f1342d9002c891d0a43f96
parent3c0c68ae460e947aaae5702bda6258fb812e1029 (diff)
Register the name of the config file each config target was found in
Reviewed-by: Andy Polyakov <appro@openssl.org>
-rwxr-xr-xConfigure9
1 files changed, 7 insertions, 2 deletions
diff --git a/Configure b/Configure
index 36734d3bad..9f95f77aa2 100755
--- a/Configure
+++ b/Configure
@@ -921,6 +921,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}="";
@@ -2209,7 +2211,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 $@;
@@ -2224,7 +2227,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);