cleanup: just assume configure input is configure.ac

We have removed support for configure.in in a previous patch anyway.

* automake.in ($configure_ac): Initialize statically to 'configure.ac'.
* aclocal.in: Likewise.
* lib/Automake/Variable.pm: Likewise. Consequently, ...
(Automake::Configure_ac): ... drop this import, that is not required
anymore.

diff --git a/aclocal.in b/aclocal.in
index 5af016ab50c87019dec6bb30eadc1dbbbafb88d9..f3b6e6a35959be449571398613a7f33068c076b3 100644 (file)
--- a/aclocal.in
+++ b/aclocal.in
@@ -70,8 +70,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';
@@ -1037,7 +1038,7 @@ sub parse_ACLOCAL_PATH ()
 parse_WARNINGS;                    # Parse the WARNINGS environment variable.
 parse_arguments;
 parse_ACLOCAL_PATH;
-$configure_ac = require_configure_ac;
+require_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

diff --git a/automake.in b/automake.in
index cf1385f161c7f0f2500ab5b66b060d062f91c9ad..5ba22f7b954cac034f635c51a633c726825a42be 100644 (file)
--- a/automake.in
+++ b/automake.in
@@ -338,8 +338,9 @@ my $force_missing = 0;
 ## Variables filled during files scanning.  ##
 ## ---------------------------------------- ##
 
-# Name of the configure.ac file.
-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';
 
 # Files found by scanning configure.ac for LIBOBJS.
 my %libsources = ();
@@ -8006,7 +8007,7 @@ parse_WARNINGS;
 # Parse command line.
 parse_arguments;
 
-$configure_ac = require_configure_ac;
+require_configure_ac;
 
 # Do configure.ac scan only once.
 scan_autoconf_files;

diff --git a/lib/Automake/Variable.pm b/lib/Automake/Variable.pm
index 6ed112c4ce086cb34c18bfad9e60970cb92f976e..a1ef30f0b319a763760be7cb92a1aee919fb5d5e 100644 (file)
--- a/lib/Automake/Variable.pm
+++ b/lib/Automake/Variable.pm
@@ -21,7 +21,6 @@ use Carp;
 
 use Automake::Channels;
 use Automake::ChannelDefs;
-use Automake::Configure_ac;
 use Automake::Item;
 use Automake::VarDef;
 use Automake::Condition qw (TRUE FALSE);
@@ -194,7 +193,7 @@ my %_ac_macro_for_var =
    );
 
 # The name of the configure.ac file.
-my $configure_ac;
+my $configure_ac = 'configure.ac';
 
 # Variables that can be overridden without complaint from -Woverride
 my %_silent_variable_override =
@@ -1027,9 +1026,6 @@ 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)
     {