Re: Problem with dejagnu.am

[Alexandre Duret-Lutz <adl at src dot lip6 dot fr>]

>>> "Mark" == Mark Mitchell <mark@codesourcery.com> writes:

 Mark> On Sat, 2003-08-23 at 03:22, Alexandre Duret-Lutz wrote:
 >> >>> "Mark" == Mark Mitchell <mark@codesourcery.com> writes:
 >> 
 Mark> In dejagnu.am there is:
 >> 
 Mark> ## Flags for DejaGNU.
 Mark> RUNTESTFLAGS =
 >> 
 Mark> As far as I can tell, all that does is:
[...]
 Mark> (b) Prevent users from setting the value in the environment.
 >> 
 >> Similar variables (ETAGSFLAGS, CTAGSFLAGS, and JAVACFLAGS) are
 >> defined this way.  This has always puzzled me and I believe the
 >> point is precisely to have environment independent builds, at
 >> least I can't think of any other.  Maybe Tom can shed some light
 >> on this, since he actually defined all of these variables
 >> consistently
[...]
 Mark> I don't have a terribly strong opinion here, but I think that explicitly
 Mark> setting these flag variables provides only minor benefits and is a
 Mark> nuisance in the imperfect real world.

Since there have been no other opinions, I'm installing the
following change.

2003-11-08  Alexandre Duret-Lutz  <adl@gnu.org>

	* lib/am/tags.am (ETAGSFLAGS, CTAGSFLAGS): Remove.
	* lib/am/dejagnu.am (RUNTESTFLAGS): Remove.
	* lib/am/java.am (JAVACFLAGS): Remove.
	* tests/dejagnu3.test: Check that the environment value
	of RUNTESTFLAGS get passed down to runtest.
	Suggested by Mark Mitchell.

Index: NEWS
===================================================================
RCS file: /cvs/automake/automake/NEWS,v
retrieving revision 1.236
diff -u -r1.236 NEWS
--- NEWS	8 Nov 2003 13:01:13 -0000	1.236
+++ NEWS	8 Nov 2003 15:31:32 -0000
@@ -199,6 +199,12 @@
          core dump files.  A core file on one system might be a
 	 completely legitimate data file on another system.
 
+  - RUNTESTFLAGS, CTAGSFLAGS, ETAGSFLAGS, JAVACFLAGS are no longer
+    defined by Automake.  This means that any definition in the
+    environment will be used, unless overridden in the Makefile.am or
+    on the command line.  The old behavior, where these variables were
+    defined empty in each Makefile, can be obtained by AC_SUBSTing or
+    AC_ARG_VARing each variable from configure.ac.
 
 New in 1.7:
 * Autoconf 2.54 is required.
Index: THANKS
===================================================================
RCS file: /cvs/automake/automake/THANKS,v
retrieving revision 1.224
diff -u -r1.224 THANKS
--- THANKS	24 Oct 2003 19:33:17 -0000	1.224
+++ THANKS	8 Nov 2003 15:31:32 -0000
@@ -133,6 +133,7 @@
 Mark Eichin		eichin@cygnus.com
 Mark Elbrecht		snowball3@bigfoot.com
 Mark Galassi		rosalia@nis.lanl.gov
+Mark Mitchell		mark@codesourcery.com
 Markku Rossi		mtr@ngs.fi
 Markus F.X.J. Oberhumer	k3040e4@wildsau.idv-edu.uni-linz.ac.at
 Martin Frydl		martin@idoox.com
Index: lib/am/dejagnu.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/dejagnu.am,v
retrieving revision 1.22
diff -u -r1.22 dejagnu.am
--- lib/am/dejagnu.am	6 Sep 2003 05:36:57 -0000	1.22
+++ lib/am/dejagnu.am	8 Nov 2003 15:31:34 -0000
@@ -17,9 +17,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-## Flags for DejaGnu.
-RUNTESTFLAGS =
-
 ## Name of tool to use.  Default is the same as the package.
 DEJATOOL = $(PACKAGE)
 
Index: lib/am/java.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/java.am,v
retrieving revision 1.18
diff -u -r1.18 java.am
--- lib/am/java.am	2 Jun 2003 07:08:40 -0000	1.18
+++ lib/am/java.am	8 Nov 2003 15:31:34 -0000
@@ -22,7 +22,6 @@
 ## ---------- ##
 
 JAVAC = javac
-JAVACFLAGS =
 CLASSPATH_ENV = CLASSPATH=$(JAVAROOT):$(srcdir)/$(JAVAROOT):$$CLASSPATH
 JAVAROOT = $(top_builddir)
 
Index: lib/am/tags.am
===================================================================
RCS file: /cvs/automake/automake/lib/am/tags.am,v
retrieving revision 1.39
diff -u -r1.39 tags.am
--- lib/am/tags.am	23 Mar 2003 20:37:20 -0000	1.39
+++ lib/am/tags.am	8 Nov 2003 15:31:34 -0000
@@ -17,10 +17,6 @@
 ## Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA
 ## 02111-1307, USA.
 
-.PHONY: tags
-tags: TAGS
-
-
 ## ---- ##
 ## ID.  ##
 ## ---- ##
@@ -42,7 +38,8 @@
 ## ------ ##
 
 ETAGS = etags
-ETAGSFLAGS =
+.PHONY: tags
+tags: TAGS
 
 TAGS: %TAGSDIRS% $(HEADERS) $(SOURCES) %CONFIG% $(TAGS_DEPENDENCIES) \
 		$(TAGS_FILES) $(LISP)
@@ -84,8 +81,6 @@
 ## ------------- ##
 
 CTAGS = ctags
-CTAGSFLAGS =
-
 .PHONY: CTAGS ctags
 ctags: CTAGS
 
Index: tests/dejagnu3.test
===================================================================
RCS file: /cvs/automake/automake/tests/dejagnu3.test,v
retrieving revision 1.3
diff -u -r1.3 dejagnu3.test
--- tests/dejagnu3.test	18 Apr 2003 17:15:02 -0000	1.3
+++ tests/dejagnu3.test	8 Nov 2003 15:31:36 -0000
@@ -66,3 +66,8 @@
 test -f hammer.sum
 
 $MAKE distcheck
+
+# Ensure that the envvar RUNTESTFLAGS is used.
+# Report from Mark Mitchell.
+RUNTESTFLAGS=--unknown-option $MAKE check && exit 1
+exit 0

-- 
Alexandre Duret-Lutz