From f4954f569194d0218ffa37fd5937b08bbd6db7d5 Mon Sep 17 00:00:00 2001
From: Andreas Schwab <schwab@linux-m68k.org>
Date: Fri, 3 Apr 2009 07:20:53 +0200
Subject: [PATCH] Fix instdir-java.test failure.

* tests/instdir-java.test: Don't require gcj.  Skip if javac is
not available.

Signed-off-by: Ralf Wildenhues <Ralf.Wildenhues@gmx.de>
---
 ChangeLog               | 5 +++++
 tests/instdir-java.test | 3 ++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/ChangeLog b/ChangeLog
index 72809f898..ff1cc4afd 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,8 @@
+2009-04-03  Andreas Schwab  <schwab@linux-m68k.org>
+
+	* tests/instdir-java.test: Don't require gcj.  Skip if javac is
+	not available.
+
 2009-04-01  Ralf Wildenhues  <Ralf.Wildenhues@gmx.de>
 
 	Fix testsuite failures due to nonexistent `dirlist' entries.
diff --git a/tests/instdir-java.test b/tests/instdir-java.test
index 54826c8f9..186871c49 100755
--- a/tests/instdir-java.test
+++ b/tests/instdir-java.test
@@ -16,12 +16,13 @@
 
 # If $(javadir) is the empty string, then nothing should be installed there.
 
-required=gcj
 . ./defs || Exit 1
 
 set -e
 
 cat >>configure.in <<'END'
+AC_CHECK_PROG([HAS_JAVAC], [javac], [:], [exit])
+($HAS_JAVAC 77); $HAS_JAVAC 77
 AC_OUTPUT
 END
 
-- 
2.47.2