Revert the fix for PR automake/291:

* automake.in (macro_define): Do not warn about variables
starting with `_' which are an issue on NEWS-OS 4.2R.  According
to Paul Eggert, NEWS-OS 4.2R is ten years old, the latest version
was released on 1996 and is not in wide use.  On the other hand,
variables starting with `_' are mandatory in several situations,
so diagnosing them is more annoying than useful.
* tests/canon5.test: Do not use -Wno-portability.
* tests/vars2.test: Delete.
* tests/Makefile.am (TESTS): Remove vars2.test.
Suggested by Jim Meyering.

6 files changed, 18 insertions, 54 deletions

diff --git a/ChangeLog b/ChangeLog
index f9f73c61e..6b5ad61b9 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,17 @@
+2003-08-10  Alexandre Duret-Lutz  <adl@gnu.org>
+
+	Revert the fix for PR automake/291:
+	* automake.in (macro_define): Do not warn about variables
+	starting with `_' which are an issue on NEWS-OS 4.2R.  According
+	to Paul Eggert, NEWS-OS 4.2R is ten years old, the latest version
+	was released on 1996 and is not in wide use.  On the other hand,
+	variables starting with `_' are mandatory in several situations,
+	so diagnosing them is more annoying than useful.
+	* tests/canon5.test: Do not use -Wno-portability.
+	* tests/vars2.test: Delete.
+	* tests/Makefile.am (TESTS): Remove vars2.test.
+	Suggested by Jim Meyering.
+
 2003-04-21  Jim Meyering  <jim@meyering.net>
 
 	* lib/mkinstalldirs: Remove each sequence of spaces before a
diff --git a/automake.in b/automake.in
index 1cfbb8b08..706440e38 100755
--- a/automake.in
+++ b/automake.in
@@ -6428,11 +6428,6 @@ sub macro_define ($$$$$$)
   error $where, "bad characters in variable name `$var'"
     if $var !~ /$MACRO_PATTERN/o;
 
-  # NEWS-OS 4.2R complains if a Makefile variable begins with `_'.
-  msg ('portability', $where,
-       "$var: Make variable names starting with `_' are not portable")
-    if $var =~ /^_/;
-
   # `:='-style assignments are not acknowledged by POSIX.  Moreover it
   # has multiple meanings.  In GNU make or BSD make it means "assign
   # with immediate expansion", while in OSF make it is used for
diff --git a/tests/Makefile.am b/tests/Makefile.am
index 6dded66d6..05dfbffe5 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -440,7 +440,6 @@ txinfo22.test \
 transform.test \
 unused.test \
 vars.test \
-vars2.test \
 vars3.test \
 vartar.test \
 version.test \
diff --git a/tests/Makefile.in b/tests/Makefile.in
index 602266c2d..adab20621 100644
--- a/tests/Makefile.in
+++ b/tests/Makefile.in
@@ -534,7 +534,6 @@ txinfo22.test \
 transform.test \
 unused.test \
 vars.test \
-vars2.test \
 vars3.test \
 vartar.test \
 version.test \
diff --git a/tests/canon5.test b/tests/canon5.test
index 66e6519f3..d6cdffd0f 100755
--- a/tests/canon5.test
+++ b/tests/canon5.test
@@ -1,5 +1,5 @@
 #! /bin/sh
-# Copyright (C) 1999, 2001, 2002  Free Software Foundation, Inc.
+# Copyright (C) 1999, 2001, 2002, 2003  Free Software Foundation, Inc.
 #
 # This file is part of GNU Automake.
 #
@@ -38,21 +38,18 @@ bin_PROGRAMS = _foo
 _foo_SOURCES = foo.c
 END
 
-# Variables starting with `_' are not portable.
-$AUTOMAKE -Wno-portability || exit 1
+$AUTOMAKE || exit 1
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = ,foo
 ,foo_SOURCES = foo.c
 END
 
-# Variables starting with `_' are not portable.
-$AUTOMAKE -Wno-portability && exit 1
+$AUTOMAKE && exit 1
 
 cat > Makefile.am << 'END'
 bin_PROGRAMS = ,foo
 _foo_SOURCES = foo.c
 END
 
-# Variables starting with `_' are not portable.
-$AUTOMAKE -Wno-portability
+$AUTOMAKE
diff --git a/tests/vars2.test b/tests/vars2.test
deleted file mode 100755
index 35e1acdf0..000000000
--- a/tests/vars2.test
+++ /dev/null
@@ -1,40 +0,0 @@
-#! /bin/sh
-# Copyright (C) 2002  Free Software Foundation, Inc.
-#
-# This file is part of GNU Automake.
-#
-# GNU Automake is free software; you can redistribute it and/or modify
-# it under the terms of the GNU General Public License as published by
-# the Free Software Foundation; either version 2, or (at your option)
-# any later version.
-#
-# GNU Automake is distributed in the hope that it will be useful,
-# but WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
-# GNU General Public License for more details.
-#
-# You should have received a copy of the GNU General Public License
-# along with autoconf; see the file COPYING.  If not, write to
-# the Free Software Foundation, Inc., 59 Temple Place - Suite 330,
-# Boston, MA 02111-1307, USA.
-
-# Check that Automake warns about variables starting with `_'.
-# PR/291
-
-. ./defs || exit 1
-
-set -e
-
-cat >Makefile.am <<EOF
-GOOD_ = 1
-_BAD  = 2
- _bad = 3
-EOF
-
-$ACLOCAL
-# Make sure this warning is print in the `portability' category.
-$AUTOMAKE --warnings=no-error,none,portability 2>stderr
-cat stderr
-grep GOOD stderr && exit 1
-grep _BAD stderr
-grep _bad stderr