--- a/ChangeLog	Mon Jun 08 06:07:58 2015 +0100
+++ b/ChangeLog	Mon Jun 08 06:14:14 2015 +0100
@@ -1,3 +1,19 @@
+2015-06-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2408: Enable Zero when Shark is enabled
+	* NEWS: Updated.
+
+2014-01-09  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR2408: Enable Zero when Shark is enabled
+	* 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.
+
 2015-06-08  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2407: Fix automatic enabling of the Zero build

--- a/NEWS	Mon Jun 08 06:07:58 2015 +0100
+++ b/NEWS	Mon Jun 08 06:14:14 2015 +0100
@@ -76,6 +76,7 @@
   - PR2377: PaX mark the installed JDK so it runs on hardened systems
   - PR2383: Location of docs directory in install-data-local is incorrect
   - PR2407: Fix automatic enabling of the Zero build on non-JIT architectures which don't use CACAO or JamVM
+  - PR2408: Enable Zero when Shark is enabled
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck

--- a/acinclude.m4	Mon Jun 08 06:07:58 2015 +0100
+++ b/acinclude.m4	Mon Jun 08 06:14:14 2015 +0100
@@ -614,6 +614,7 @@
   AC_REQUIRE([IT_SET_ARCH_SETTINGS])
   AC_REQUIRE([IT_ENABLE_CACAO])
   AC_REQUIRE([IT_ENABLE_JAMVM])
+  AC_REQUIRE([IT_ENABLE_SHARK])
   AC_REQUIRE([IT_HAS_NATIVE_HOTSPOT_PORT])
   AC_MSG_CHECKING([whether to use the zero-assembler port])
   use_zero=no
@@ -681,28 +682,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],

--- a/configure.ac	Mon Jun 08 06:07:58 2015 +0100
+++ b/configure.ac	Mon Jun 08 06:14:14 2015 +0100
@@ -135,7 +135,6 @@
 
 IT_DISABLE_OPTIMIZATIONS
 IT_ENABLE_JAR_COMPRESSION
-IT_SET_SHARK_BUILD
 IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS