Register the name of the config file each config target was found in
authorRichard Levitte <levitte@openssl.org>
Wed, 14 Sep 2016 20:21:41 +0000 (22:21 +0200)
committerRichard Levitte <richard@levitte.org>
Fri, 16 Sep 2016 09:53:29 +0000 (11:53 +0200)
Reviewed-by: Andy Polyakov <appro@openssl.org>
(cherry picked from commit ee9b0bbb4c66812da18939ea96c4625cb001f3bd)

Configure

index 9c183daaeb70e580b0411006863e6c960a8dd61d..f2dde798efb79f999ca75fcbc71daa037751d059 100755 (executable)
--- 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);