diff options
Diffstat (limited to 'bin/aclocal.in')
| -rw-r--r-- | bin/aclocal.in | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/bin/aclocal.in b/bin/aclocal.in index aad0cfb4e..45140feb5 100644 --- a/bin/aclocal.in +++ b/bin/aclocal.in @@ -35,7 +35,6 @@ use strict; use Automake::Config; use Automake::General; -use Automake::Configure_ac; use Automake::Channels; use Automake::ChannelDefs; use Automake::XFile; @@ -80,8 +79,9 @@ my @diff_command; # --dry-run my $dry_run = 0; -# configure.ac or configure.in. -my $configure_ac; +# Name of the Autoconf input file. We used to support 'configure.in' +# as well once, that that is long obsolete now. +my $configure_ac = 'configure.ac'; # Output file name. my $output_file = 'aclocal.m4'; @@ -449,8 +449,8 @@ sub scan_m4_files () SCAN_M4_DIRS_ERROR, @user_includes[1..$#user_includes]); } - scan_m4_dirs (FT_AUTOMAKE, SCAN_M4_DIRS_ERROR, @automake_includes); scan_m4_dirs (FT_SYSTEM, SCAN_M4_DIRS_ERROR, @system_includes); + scan_m4_dirs (FT_AUTOMAKE, SCAN_M4_DIRS_ERROR, @automake_includes); # Construct a new function that does the searching. We use a # function (instead of just evaluating $search in the loop) so that @@ -1033,7 +1033,7 @@ sub usage ($) print <<'EOF'; Usage: aclocal [OPTION]... -Generate 'aclocal.m4' by scanning 'configure.ac' or 'configure.in' +Generate 'aclocal.m4' by scanning 'configure.ac' Options: --automake-acdir=DIR directory holding automake-provided m4 files @@ -1178,7 +1178,8 @@ if (exists $ENV{"AUTOMAKE_UNINSTALLED"}) parse_WARNINGS; # Parse the WARNINGS environment variable. parse_arguments; parse_ACLOCAL_PATH; -$configure_ac = require_configure_ac; + +fatal "$configure_ac is required" unless -f $configure_ac; # We may have to rerun aclocal if some file have been installed, but # it should not happen more than once. The reason we must run again |