From: Stefano Lattarini <stefano.lattarini@gmail.com>
Date: Fri, 21 Sep 2012 18:59:01 +0000 (+0200)
Subject: autoreconf: assume --force-missing automake option is supported
X-Git-Tag: v2.69b~207
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6e7c2223e691b984ce025d7e83e6caed9630d8c7;p=thirdparty%2Fautoconf.git

autoreconf: assume --force-missing automake option is supported

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 <stefano.lattarini@gmail.com>
---

diff --git a/NEWS b/NEWS
index ec877c31..7db1c82f 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 versions 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 0db8dc63..75869fc0 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';
     }