[SIMPLE PATCH] {master} Remove long-deprecated options --Werror and --Wno-error.

[Stefano Lattarini]

Hello automakers.

It seems the automake options `--Werror' and `--Wno-error' (kept for
backward-compatibility only and, according to the git/CVS history,
deprecated since commit c037f202602bf50f4e82a7f63d4624c3256df7f7,
git-describe "Release-1-6-1b-35-gc037f20", dated 2002-07-06) are not
used anymore:

 
<http://www.google.com/codesearch?hl=en&lr=&q=%22--Werror%22+automake&sbtn=Search>
 
<http://www.google.com/codesearch?hl=en&sa=N&q=%22--Werror%22++lang:automake&ct=rr&cs_r=lang:automake>

The attached patch (for master) removes those options.  OK to apply?

Regards,
   Stefano

From 437f05023998787bbec052065766626973098fc5 Mon Sep 17 00:00:00 2001
From: Stefano Lattarini <address@hidden>
Date: Fri, 26 Nov 2010 16:04:06 +0100
Subject: [PATCH] Remove long-deprecated options --Werror and --Wno-error.

These options has been deprecated at least since commit
"Release-1-6-1b-35-gc037f20", dated 2002-07-06.

* automake.in (parse_arguments): Do not recognize anymore options
`--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
and `-Wno-error'.
* tests/werror.test: Update: use `-Werror' instead of `--Werror'.
---
 ChangeLog         |   10 ++++++++++
 automake.in       |    4 ----
 tests/werror.test |    4 ++--
 3 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/ChangeLog b/ChangeLog
index 278b0d0..975b818 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-11-26  Stefano Lattarini  <address@hidden>
+
+       Remove long-deprecated options --Werror and --Wno-error.
+       These options has been deprecated at least since commit
+       "Release-1-6-1b-35-gc037f20", dated 2002-07-06.
+       * automake.in (parse_arguments): Do not recognize anymore options
+       `--Werror' and `--Wno-error' as synonyms of respectively `-Werror'
+       and `-Wno-error'.
+       * tests/werror.test: Update: use `-Werror' instead of `--Werror'.
+
 2010-11-25  Stefano Lattarini  <address@hidden>
 
        Fix spurious failures in `silent*.test' for $CC != gcc
diff --git a/automake.in b/automake.in
index 5c44767..27904f0 100644
--- a/automake.in
+++ b/automake.in
@@ -8464,10 +8464,6 @@ sub parse_arguments ()
      'c|copy'          => \$copy_missing,
      'v|verbose'       => sub { setup_channel 'verb', silent => 0; },
      'W|warnings=s'     => \&parse_warnings,
-     # These long options (--Werror and --Wno-error) for backward
-     # compatibility.  Use -Werror and -Wno-error today.
-     'Werror'           => sub { parse_warnings 'W', 'error'; },
-     'Wno-error'        => sub { parse_warnings 'W', 'no-error'; },
      );
   use Getopt::Long;
   Getopt::Long::config ("bundling", "pass_through");
diff --git a/tests/werror.test b/tests/werror.test
index 355f9d2..d1b173c 100755
--- a/tests/werror.test
+++ b/tests/werror.test
@@ -14,7 +14,7 @@
 # You should have received a copy of the GNU General Public License
 # along with this program.  If not, see <http://www.gnu.org/licenses/>.
 
-# Test to make sure --Werror and --add-missing work together.
+# Test to make sure -Werror and --add-missing work together.
 
 . ./defs || Exit 1
 
@@ -25,4 +25,4 @@ set -e
 rm -f install-sh depcomp missing mkinstalldirs
 
 $ACLOCAL
-$AUTOMAKE --Werror --add-missing
+$AUTOMAKE -Werror --add-missing
-- 
1.7.1