summaryrefslogtreecommitdiff
path: root/automake.in
diff options
context:
space:
mode:
authorAlexandre Duret-Lutz <adl@gnu.org>2003-09-07 09:55:36 +0000
committerAlexandre Duret-Lutz <adl@gnu.org>2003-09-07 09:55:36 +0000
commit9e88c16c51540a59394ac9bcc607746ebcbd90d0 (patch)
tree7d7fd261ba39f838e5cfa0bd32d15195f0add5fc /automake.in
parent09cce90f0b24665e65a32194d15a5e97186cbc2d (diff)
downloadautomake-9e88c16c51540a59394ac9bcc607746ebcbd90d0.tar.gz
* aclocal.in (configure_ac): Do not call require_configure_ac
before parsing the options. * automake.in (configure_ac): Likewise. * lib/Automake/Variable.pm (configure_ac): Do not require configure.ac, find it. * lib/Automake/Configure_ac.pm (require_configure_ac): find_configure_ac never return an undefined value, so test the file's existence instead. * tests/Makefile.am (TESTS): Add help.test. * tests/help.test: New file.
Diffstat (limited to 'automake.in')
-rwxr-xr-xautomake.in4
1 files changed, 3 insertions, 1 deletions
diff --git a/automake.in b/automake.in
index 2e9176103..cd182f742 100755
--- a/automake.in
+++ b/automake.in
@@ -289,7 +289,7 @@ my $force_missing = 0;
## ---------------------------------------- ##
# Name of the configure.ac file.
-my $configure_ac = require_configure_ac;
+my $configure_ac;
# Files found by scanning configure.ac for LIBOBJS.
my %libsources = ();
@@ -6901,6 +6901,8 @@ parse_WARNINGS;
# Parse command line.
parse_arguments;
+$configure_ac = require_configure_ac;
+
# Do configure.ac scan only once.
scan_autoconf_files;