[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Automake-NG] [PATCH 2/4] [ng] cleanup: just assume configure input is c
From: |
Stefano Lattarini |
Subject: |
[Automake-NG] [PATCH 2/4] [ng] cleanup: just assume configure input is configure.ac |
Date: |
Fri, 25 May 2012 17:51:00 +0200 |
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.
---
aclocal.in | 7 ++++---
automake.in | 7 ++++---
lib/Automake/Variable.pm | 6 +-----
3 files changed, 9 insertions(+), 11 deletions(-)
diff --git a/aclocal.in b/aclocal.in
index 5af016a..f3b6e6a 100644
--- 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 cf1385f..5ba22f7 100644
--- 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 6ed112c..a1ef30f 100644
--- 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)
{
--
1.7.9.5
- [Automake-NG] [PATCH 0/4] Assume configure.ac is Autoconf input; drop support for configure.in, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 2/4] [ng] cleanup: just assume configure input is configure.ac,
Stefano Lattarini <=
- [Automake-NG] [PATCH 1/4] [ng] cleanup: don't support configure.in anymore, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 3/4] [ng] cleanup: get rid of 'Automake::Configure_ac' module, Stefano Lattarini, 2012/05/25
- [Automake-NG] [PATCH 4/4] [ng] maintcheck: obsolete check 'sc_tests_no_configure_in' removed, Stefano Lattarini, 2012/05/25
- Re: [Automake-NG] [PATCH 0/4] Assume configure.ac is Autoconf input; drop support for configure.in, Stefano Lattarini, 2012/05/26
- Re: [Automake-NG] [PATCH 0/4] Assume configure.ac is Autoconf input; drop support for configure.in, Akim Demaille, 2012/05/29