Commit efd23794 authored by Richard Levitte's avatar Richard Levitte Committed by Richard Levitte
Browse files

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



Reviewed-by: default avatarAndy Polyakov <appro@openssl.org>
(cherry picked from commit ee9b0bbb)
parent ea6e2d54

Configure

+7 −2
Original line number Diff line number Diff line
@@ -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,6 +2243,8 @@ sub read_config { 
		warn "Misconfigured target configuration for $_ (should be a hash table), ignoring...\n";

	    }

	    delete $targets{$_};

	} else {

            $targets{$_}->{_conf_fname_int} = add([ $fname ]);

        }

    }