diff options
| author | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-04-20 07:43:59 +0200 |
|---|---|---|
| committer | Ralf Wildenhues <Ralf.Wildenhues@gmx.de> | 2010-04-20 07:44:29 +0200 |
| commit | 53ac1719ca6b8ecaf1b64176ec72905432a7d8f4 (patch) | |
| tree | fa34c22ae775638b927bb53272885c68464e6979 /lib/Automake/Variable.pm | |
| parent | 3645d214c9c8afe4e7228bdd69f2eceddfaa1473 (diff) | |
| download | automake-53ac1719ca6b8ecaf1b64176ec72905432a7d8f4.tar.gz | |
Fix -Werror handling for presence of configure.in and configure.ac.
* lib/Automake/Variable.pm (Automake::Variable): Do not initialize
$configure_ac at the global level, before command-line arguments
have been parsed.
(require_variables): Initialize it here.
* tests/configure.test: New test.
* tests/Makefile.am: Update.
Report by Stefano Lattarini.
Diffstat (limited to 'lib/Automake/Variable.pm')
| -rw-r--r-- | lib/Automake/Variable.pm | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm index 8a5b56875..326136031 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) { |