summaryrefslogtreecommitdiff
path: root/lib/Automake/Variable.pm
diff options
context:
space:
mode:
authorRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-04-20 07:47:11 +0200
committerRalf Wildenhues <Ralf.Wildenhues@gmx.de>2010-04-20 07:47:11 +0200
commitfcad1df725e0a143bd3e8e2f340961145d33b82a (patch)
tree8aba70e78e0b6f64c161cf419cb3b4642f5f4e1d /lib/Automake/Variable.pm
parent1655285990bc5ff11335b7a03e683cb4062bf0ef (diff)
parent53ac1719ca6b8ecaf1b64176ec72905432a7d8f4 (diff)
downloadautomake-fcad1df725e0a143bd3e8e2f340961145d33b82a.tar.gz
Merge branch 'maint'
Diffstat (limited to 'lib/Automake/Variable.pm')
-rw-r--r--lib/Automake/Variable.pm5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index bf44c3852..5d7c1d510 100644
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -193,7 +193,7 @@ my %_ac_macro_for_var =
);
# The name of the configure.ac file.
-my $configure_ac = find_configure_ac;
+my $configure_ac;
# Variables that can be overridden without complaint from -Woverride
my %_silent_variable_override =
@@ -1132,6 +1132,9 @@ sub require_variables ($$$@)
my $res = 0;
$reason .= ' but ' unless $reason eq '';
+ $configure_ac = find_configure_ac
+ unless defined $configure_ac;
+
VARIABLE:
foreach my $var (@vars)
{