[FYI] {master} tests: look for GNU Java compiler at configure time

[Stefano Lattarini]

Do this for consistency with what is done with other compilers.

* configure.ac: Look for GNU java compiler at configure time.
* tests/defs (gcj): Adjust and simplify.
($am__tool_prefix): Remove definition, it's not used anymore.
---
 configure.ac |    8 ++++++++
 tests/defs   |   16 ++--------------
 2 files changed, 10 insertions(+), 14 deletions(-)

diff --git a/configure.ac b/configure.ac
index a9dd20b..c8d5a34 100644
--- a/configure.ac
+++ b/configure.ac
@@ -378,6 +378,14 @@ AS_IF([AM_RUN_LOG([$GNU_F77 --version && $GNU_F77 -v])], 
[],
       [AC_MSG_WARN([botched installation for GNU Fortran 77 compiler])
       _AM_SKIP_COMP_TESTS([GNU Fortran 77])])
 
+# GNU Java compiler.
+AC_ARG_VAR([GNU_GCJ], [GNU Java compiler])
+AC_ARG_VAR([GNU_GCJFLAGS], [GNU Java compiler flags])
+AC_CHECK_TOOLS([GNU_GCJ], [gcj], [false])
+AS_IF([AM_RUN_LOG([$GNU_GCJ --version && $GNU_GCJ -v])], [],
+      [AC_MSG_WARN([botched installation for GNU Java compiler])
+      _AM_SKIP_COMP_TESTS([GNU Java])])
+
 # If we have been able to find at least a working compiler above, we
 # know what the object and executable extensions for this platform are.
 OBJEXT=${ac_cv_objext-UNKNOWN}
diff --git a/tests/defs b/tests/defs
index ab5717b..e925222 100644
--- a/tests/defs
+++ b/tests/defs
@@ -725,14 +725,6 @@ require_compiler_ ()
 ##  required by them.                                          ##
 ## ----------------------------------------------------------- ##
 
-# So that we can force the use of correct gcc, g++ etc., consistently
-# with cross-compilation settings.
-if cross_compiling; then
-  am__tool_prefix="$host_alias-"
-else
-  am__tool_prefix=
-fi
-
 # Look for (and maybe set up) required tools and/or system features; skip
 # the current test if they are not found.
 for tool in : $required
@@ -803,12 +795,8 @@ do
       unset make_
       ;;
     gcj)
-      GCJ=${am__tool_prefix}gcj
-      export GCJ
-      echo "$me: running $GCJ --version"
-      $GCJ --version || skip_all_ "GNU Java compiler not available"
-      echo "$me: running $GCJ -v"
-      $GCJ -v || skip_all_ "botched installation for GNU Java compiler"
+      GCJ=$GNU_GCJ GCJFLAGS=$GNU_GCJFLAGS; export GCJ GCJFLAGS
+      test "$GCJ" = false && skip_all_ "GNU Java compiler unavailable"
       ;;
     gcc)
       CC=$GNU_CC CFLAGS=$GNU_CFLAGS; export CC CFLAGS CPPFLAGS
-- 
1.7.9