tests: fix spurious failure in 'primary-prefix-valid-couples.test'

* tests/primary-prefix-valid-couples.test: After commit
v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
combination by default anymore: one has to explicitly define
$(javadir) to make it so.  So just drop `java_JAVA' from our
Makefile.am  Also, since we are at it, ...
(configure.in): ... remove AM_PROG_GCJ from here, as it's not
really required.

diff --git a/ChangeLog b/ChangeLog
index 8a697e672b0012cc65cf0ea790cf9f7f4e8bdffe..6c66f9e0a12c15bae7b9b97cae15e9e8fd69d0d9 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-19  Stefano Lattarini  <stefano.lattarini@gmail.com>
+
+       tests: fix spurious failure in 'primary-prefix-valid-couples.test'
+       * tests/primary-prefix-valid-couples.test: After commit
+       v1.11-464-gc9dfc36, `java_JAVA' is not a valid prefix/primary
+       combination by default anymore: one has to explicitly define
+       $(javadir) to make it so.  So just drop `java_JAVA' from our
+       Makefile.am  Also, since we are at it, ...
+       (configure.in): ... remove AM_PROG_GCJ from here, as it's not
+       really required.
+
 2011-09-18  Stefano Lattarini  <stefano.lattarini@gmail.com>
 
        java: complain if java_JAVA is used but $(javadir) is undefined

diff --git a/tests/primary-prefix-valid-couples.test b/tests/primary-prefix-valid-couples.test
index f326808ff7a39a9bec9c4a18d737f14a1dc1bbd6..36ff5d88818e23847d245c7d9d51944e4d16df9c 100755 (executable)
--- a/tests/primary-prefix-valid-couples.test
+++ b/tests/primary-prefix-valid-couples.test
@@ -25,7 +25,6 @@ cat >> configure.in <<'END'
 AC_PROG_CC
 AC_PROG_RANLIB
 AC_PROG_LIBTOOL
-AM_PROG_GCJ
 AM_PATH_PYTHON
 AM_PATH_LISPDIR
 END
@@ -78,7 +77,6 @@ done
 echo "info_TEXINFOS = foo.texi" >> Makefile.am
 echo "lisp_LISP = foo.el" >> Makefile.am
 echo "python_PYTHON = foo.py" >> Makefile.am
-echo "java_JAVA = foo.java" >> Makefile.am
 
 awk '{print NR ":" $0}' Makefile.am # For debugging.