On Sunday 18 September 2011, Stefano Lattarini wrote:
> tags 8461 patch
> close 8461
> thanks
>
> Reference:
> <http://debbugs.gnu.org/cgi/bugreport.cgi?bug=8461>
>
> I've decided to go with the third option listed there; attached is the
> patch I've pushed to maint.
>
> Regards,
> Stefano
>
That change has caused a minor fallout in a test case, which I've fixed with
the attached patch.
Regards,
Stefano
From d5ebf21cccd0597f53e7b3c4063dff4704e454a6 Mon Sep 17 00:00:00 2001
Message-Id: <d5ebf21cccd0597f53e7b3c4063dff4704e454a6.1316449298.git.stefano.lattar...@gmail.com>
From: Stefano Lattarini <stefano.lattar...@gmail.com>
Date: Mon, 19 Sep 2011 18:21:25 +0200
Subject: [PATCH] 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.
---
ChangeLog | 11 +++++++++++
tests/primary-prefix-valid-couples.test | 2 --
2 files changed, 11 insertions(+), 2 deletions(-)
diff --git a/ChangeLog b/ChangeLog
index 8a697e6..6c66f9e 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,14 @@
+2011-09-19 Stefano Lattarini <stefano.lattar...@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.lattar...@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 f326808..36ff5d8 100755
--- 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.
--
1.7.2.3
