diff options
Diffstat (limited to 'src/tools/msvc/Install.pm')
| -rw-r--r-- | src/tools/msvc/Install.pm | 13 |
1 files changed, 10 insertions, 3 deletions
diff --git a/src/tools/msvc/Install.pm b/src/tools/msvc/Install.pm index 3923532a143..235a1504fac 100644 --- a/src/tools/msvc/Install.pm +++ b/src/tools/msvc/Install.pm @@ -37,9 +37,16 @@ sub Install $| = 1; my $target = shift; - our $config; - require "config_default.pl"; - require "config.pl" if (-f "config.pl"); + # if called from vcregress, the config will be passed to us + # so no need to re-include these + our $config = shift; + unless ($config) + { + # suppress warning about harmless redeclaration of $config + no warnings 'misc'; + require "config_default.pl"; + require "config.pl" if (-f "config.pl"); + } chdir("../../..") if (-f "../../../configure"); chdir("../../../..") if (-f "../../../../configure"); |