[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[PATCH 3/3] autoreconf: assume --force-missing automake option is suppor
From: |
Stefano Lattarini |
Subject: |
[PATCH 3/3] autoreconf: assume --force-missing automake option is supported |
Date: |
Fri, 21 Sep 2012 10:10:43 +0200 |
According to Automake's NEWS file, it is since at least Automake 1.8,
and in autoreconf we are already assuming aclocal >= 1.8 anyway.
* bin/autoreconf.in (parse_args): Simplify a little by just assuming
the automake option '--force-missing' is supported.
($automake_supports_force_missing): Delete, no longer needed.
* NEWS: Update.
Signed-off-by: Stefano Lattarini <address@hidden>
---
NEWS | 3 ++-
bin/autoreconf.in | 6 +-----
2 files changed, 3 insertions(+), 6 deletions(-)
diff --git a/NEWS b/NEWS
index 54e8112..e5e0dcc 100644
--- a/NEWS
+++ b/NEWS
@@ -5,7 +5,8 @@ GNU Autoconf NEWS - User visible changes.
** The use of the long-deprecated name 'configure.in' for the autoconf
input file now elicits a warning in the 'obsolete' category.
-** Older version of aclocal (< 1.8) are no longer supported by autoreconf.
+** Older version of automake and aclocal (< 1.8) are no longer supported
+ by autoreconf.
** MACROS
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index ffb72af..9239797 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -121,8 +121,6 @@ my $install = 0;
my $symlink = 0;
# Does aclocal support -Wfoo?
my $aclocal_supports_warnings = 0;
-# Does automake support --force-missing?
-my $automake_supports_force_missing = 0;
# Does automake support -Wfoo?
my $automake_supports_warnings = 0;
@@ -186,7 +184,6 @@ sub parse_args ()
my $aclocal_help = `$aclocal --help 2>/dev/null`;
my $automake_help = `$automake --help 2>/dev/null`;
$aclocal_supports_warnings = $aclocal_help =~ /--warnings/;
- $automake_supports_force_missing = $automake_help =~ /--force-missing/;
$automake_supports_warnings = $automake_help =~ /--warnings/;
# Dispatch autoreconf's option to the tools.
@@ -210,8 +207,7 @@ sub parse_args ()
$aclocal .= ' --force';
$autoconf .= ' --force';
$autoheader .= ' --force';
- $automake .= ' --force-missing'
- if $automake_supports_force_missing;
+ $automake .= ' --force-missing';
$autopoint .= ' --force';
$libtoolize .= ' --force';
}
--
1.7.12.317.g1c54b74