[PATCH] tests: avoid spurious failure when gcj is not installed

[Jim Meyering]

I noticed the gcj4 test failing on master and wrote this patch,
but figured it belonged on the maint branch.  Humph.  It doesn't even
apply there, due to lack of defs-static.in, and in fact the gcj4 test
doesn't fail on maint, either.

Is there a schedule for merging maint into master?


>From 39c13b5bc88dc2a3e28301e1d1a089bd13089c48 Mon Sep 17 00:00:00 2001
From: Jim Meyering <address@hidden>
Date: Sat, 25 Feb 2012 12:37:25 +0100
Subject: [PATCH] tests: avoid spurious failure when gcj is not installed

* tests/defs-static.in (GNU_GCJ, GNU_GCJFLAGS): Define.
* tests/Makefile.am (do_subust): Add those to the list of substituted symbols.
---
 tests/Makefile.am    |    2 ++
 tests/defs-static.in |    2 ++
 2 files changed, 4 insertions(+)

diff --git a/tests/Makefile.am b/tests/Makefile.am
index 3c8c9d2..b6d41c7 100644
--- a/tests/Makefile.am
+++ b/tests/Makefile.am
@@ -156,6 +156,8 @@ do_subst = sed \
   -e 's|@address@hidden|$(GNU_FFLAGS)|g' \
   -e 's|@address@hidden|$(GNU_FC)|g' \
   -e 's|@address@hidden|$(GNU_FCFLAGS)|g' \
+  -e 's|@address@hidden|$(GNU_GCJ)|g' \
+  -e 's|@address@hidden|$(GNU_GCJFLAGS)|g' \
   -e 's|@address@hidden|$(YACC)|g' \
   -e 's|@address@hidden|$(LEX)|g' \
   -e 's|@address@hidden|$(TEX)|g' \
diff --git a/tests/defs-static.in b/tests/defs-static.in
index 6f79fe2..80cd1fe 100644
--- a/tests/defs-static.in
+++ b/tests/defs-static.in
@@ -205,6 +205,8 @@ 
GNU_FFLAGS=${AM_TESTSUITE_GNU_FFLAGS-${GNU_FFLAGS-'@GNU_FFLAGS@'}}
 GNU_FCFLAGS=${AM_TESTSUITE_GNU_FCFLAGS-${GNU_FCFLAGS-'@GNU_FCFLAGS@'}}
 GNU_CXXFLAGS=${AM_TESTSUITE_GNU_CXXFLAGS-${GNU_CXXFLAGS-'@GNU_CXXFLAGS@'}}
 GNU_CFLAGS=${AM_TESTSUITE_GNU_CFLAGS-${GNU_CFLAGS-'@GNU_CFLAGS@'}}
+GNU_GCJ=${AM_TESTSUITE_GNU_GCJ-${GNU_GCJ-'@GNU_GCJ@'}}
+GNU_GCJFLAGS=${AM_TESTSUITE_GNU_GCJFLAGS-${GNU_GCJFLAGS-'@GNU_GCJFLAGS@'}}

 # No all versions of Tex support '--version', so we use a configure
 # check to decide if tex is available.  This decision is embodied in
--
1.7.9.2.263.g9be8b7