/hg/release/icedtea7-2.3: Fix automatic enabling of the Zero bui...

[andrew at icedtea.classpath.org]

changeset 63207151eedc in /hg/release/icedtea7-2.3
details: http://icedtea.classpath.org/hg/release/icedtea7-2.3?cmd=changeset;node=63207151eedc
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Thu Jan 17 00:39:24 2013 +0000

	Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM.

	2013-01-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* acinclude.m4:
		(IT_ENABLE_ZERO_BUILD): Depend on
		IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that
		ENABLE_CACAO and ENABLE_JAMVM are set.  This
		makes the tests work correctly again and means
		that Zero is turned on automatically where there
		is no CACAO or JamVM and the architecture is not
		supported by a HotSpot JIT.


diffstat:

 ChangeLog    |  11 +++++++++++
 acinclude.m4 |   2 ++
 2 files changed, 13 insertions(+), 0 deletions(-)

diffs (30 lines):

diff -r cc5652c0b17e -r 63207151eedc ChangeLog
--- a/ChangeLog	Tue Jul 30 01:26:28 2013 +0100
+++ b/ChangeLog	Thu Jan 17 00:39:24 2013 +0000
@@ -1,3 +1,14 @@
+2013-01-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* acinclude.m4:
+	(IT_ENABLE_ZERO_BUILD): Depend on
+	IT_ENABLE_CACAO and IT_ENABLE_JAMVM so that
+	ENABLE_CACAO and ENABLE_JAMVM are set.  This
+	makes the tests work correctly again and means
+	that Zero is turned on automatically where there
+	is no CACAO or JamVM and the architecture is not
+	supported by a HotSpot JIT.
+
 2013-07-29  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* configure.ac: Bump to 2.3.13pre.
diff -r cc5652c0b17e -r 63207151eedc acinclude.m4
--- a/acinclude.m4	Tue Jul 30 01:26:28 2013 +0100
+++ b/acinclude.m4	Thu Jan 17 00:39:24 2013 +0000
@@ -653,6 +653,8 @@
 AC_DEFUN_ONCE([IT_ENABLE_ZERO_BUILD],
 [
   AC_REQUIRE([IT_SET_ARCH_SETTINGS])
+  AC_REQUIRE([IT_ENABLE_CACAO])
+  AC_REQUIRE([IT_ENABLE_JAMVM])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no
   AC_ARG_ENABLE([zero],