/hg/icedtea7: Enable Zero when Shark is enabled.

[andrew at icedtea.classpath.org]

changeset 1885a2b6d744 in /hg/icedtea7
details: http://icedtea.classpath.org/hg/icedtea7?cmd=changeset;node=1885a2b6d744
author: Andrew John Hughes <gnu_andrew at member.fsf.org>
date: Sun Jan 12 01:25:32 2014 -0600

	Enable Zero when Shark is enabled.

	2014-01-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>

		* acinclude.m4:
		(IT_ENABLE_ZERO_BUILD): Require IT_ENABLE_SHARK
		so use_shark is set.
		(IT_ENABLE_SHARK): Rewrite of IT_SET_SHARK_BUILD
		to simplify & match style of similar macros.
		* configure.ac:
		Don't invoke IT_SET_SHARK_BUILD explicitly.


diffstat:

 ChangeLog    |  10 ++++++++++
 acinclude.m4 |  23 ++++++++---------------
 configure.ac |   1 -
 3 files changed, 18 insertions(+), 16 deletions(-)

diffs (75 lines):

diff -r 2ecadf456797 -r 1885a2b6d744 ChangeLog
--- a/ChangeLog	Thu Dec 26 23:17:45 2013 +0000
+++ b/ChangeLog	Sun Jan 12 01:25:32 2014 -0600
@@ -1,3 +1,13 @@
+2014-01-09  Andrew John Hughes  <gnu.andrew at member.fsf.org>
+
+	* acinclude.m4:
+	(IT_ENABLE_ZERO_BUILD): Require IT_ENABLE_SHARK
+	so use_shark is set.
+	(IT_ENABLE_SHARK): Rewrite of IT_SET_SHARK_BUILD
+	to simplify & match style of similar macros.
+	* configure.ac:
+	Don't invoke IT_SET_SHARK_BUILD explicitly.
+
 2013-12-26  Andrew John Hughes  <gnu.andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 2ecadf456797 -r 1885a2b6d744 acinclude.m4
--- a/acinclude.m4	Thu Dec 26 23:17:45 2013 +0000
+++ b/acinclude.m4	Sun Jan 12 01:25:32 2014 -0600
@@ -662,6 +662,7 @@
   AC_REQUIRE([IT_SET_ARCH_SETTINGS])
   AC_REQUIRE([IT_ENABLE_CACAO])
   AC_REQUIRE([IT_ENABLE_JAMVM])
+  AC_REQUIRE([IT_ENABLE_SHARK])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no
   AC_ARG_ENABLE([zero],
@@ -735,28 +736,20 @@
   AC_SUBST(ZERO_ARCHDEF)
 ])
 
-AC_DEFUN([IT_SET_SHARK_BUILD],
+AC_DEFUN_ONCE([IT_ENABLE_SHARK],
 [
-  AC_MSG_CHECKING(whether to use the Shark JIT)
-  shark_selected=no
+  AC_MSG_CHECKING([whether to use the Shark JIT])
   AC_ARG_ENABLE([shark], [AS_HELP_STRING(--enable-shark, use Shark JIT)],
   [
-    case "${enableval}" in
-      no)
-        ;;
-      *)
-        shark_selected=yes
-        ;;
-    esac
+    use_shark="${enableval}"
+  ],
+  [
+    use_shark=no
   ])
 
-  use_shark=no
-  if test "x${shark_selected}" = "xyes"; then
-      use_shark=yes
-  fi
   AC_MSG_RESULT($use_shark)
-
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
+  AC_SUBST(ENABLE_SHARK)
 ])
 
 AC_DEFUN([IT_ENABLE_CACAO],
diff -r 2ecadf456797 -r 1885a2b6d744 configure.ac
--- a/configure.ac	Thu Dec 26 23:17:45 2013 +0000
+++ b/configure.ac	Sun Jan 12 01:25:32 2014 -0600
@@ -174,7 +174,6 @@
 IT_DISABLE_OPTIMIZATIONS
 IT_ENABLE_WERROR
 IT_ENABLE_JAR_COMPRESSION
-IT_SET_SHARK_BUILD
 IT_CHECK_ADDITIONAL_VMS
 
 IT_WITH_VERSION_SUFFIX