From 70201af851c0640cda80ec1c522e00a23906f9bf Mon Sep 17 00:00:00 2001
From: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Date: Tue, 20 Jul 2010 07:35:01 +0200
Subject: [PATCH] Let autoreconf pass warning flags to new-enough aclocal.

* bin/autoreconf.in ($aclocal_supports_warnings)
($automake_supports_warnings): New globals.
(parse_args): Set and use them.  Be sure to invoke `aclocal
--help' and `automake --help' just once each.
* NEWS: Update.
Prompted by report from Bruno Haible.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
Signed-off-by: Eric Blake <eblake@redhat.com>
---
 ChangeLog         |  8 ++++++++
 NEWS              |  2 ++
 bin/autoreconf.in | 16 +++++++++++++---
 3 files changed, 23 insertions(+), 3 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 76e77c35..1228e9be 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,13 @@
 2010-07-20  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
+	Let autoreconf pass warning flags to new-enough aclocal.
+	* bin/autoreconf.in ($aclocal_supports_warnings)
+	($automake_supports_warnings): New globals.
+	(parse_args): Set and use them.  Be sure to invoke `aclocal
+	--help' and `automake --help' just once each.
+	* NEWS: Update.
+	Prompted by report from Bruno Haible.
+
 	Fix parsing of empty variable settings on the command line.
 	* lib/autoconf/general.m4 (_AC_INIT_PARSE_ARGS): Work around
 	expr bug returning 0 instead of the empty string.
diff --git a/NEWS b/NEWS
index a8683c62..a1ce5583 100644
--- a/NEWS
+++ b/NEWS
@@ -20,6 +20,8 @@ GNU Autoconf NEWS - User visible changes.
    in other contexts, e.g., for Automake, and may be subject to
    further restrictions in the future.  Regression introduced in 2.66.
 
+** autoreconf passes warning flags to new enough versions of aclocal.
+
 
 * Major changes in Autoconf 2.66 (2010-07-02) [stable]
   Released by Eric Blake, based on git versions 2.65.*.
diff --git a/bin/autoreconf.in b/bin/autoreconf.in
index 0fc3bb8f..e22f7b63 100644
--- a/bin/autoreconf.in
+++ b/bin/autoreconf.in
@@ -122,8 +122,12 @@ my $install = 0;
 my $symlink = 0;
 # Does aclocal support --force?
 my $aclocal_supports_force = 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;
 
 my @prepend_include;
 my @include;
@@ -182,8 +186,12 @@ sub parse_args ()
 	}
     }
 
-  $aclocal_supports_force = `$aclocal --help 2>/dev/null` =~ /--force/;
-  $automake_supports_force_missing = `$automake --help 2>/dev/null` =~ /--force-missing/;
+  my $aclocal_help = `$aclocal --help 2>/dev/null`;
+  my $automake_help = `$automake --help 2>/dev/null`;
+  $aclocal_supports_force = $aclocal_help =~ /--force/;
+  $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.
   # --include;
@@ -242,7 +250,9 @@ sub parse_args ()
       $autoconf   .= $warn;
       $autoheader .= $warn;
       $automake   .= $warn
-	if `$automake --help` =~ /--warnings/;
+	if $automake_supports_warnings;
+      $aclocal    .= $warn
+        if $aclocal_supports_warnings;
     }
 }
 
-- 
2.11.4.GIT