--- a/ChangeLog	Tue Oct 06 13:42:46 2009 +0100
+++ b/ChangeLog	Thu Oct 08 13:08:52 2009 +0200
@@ -1,3 +1,11 @@
+2009-10-08  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (stamps/icedtea.stamp, stamps/icedtea-debug.stamp):
+	Add shark aliases to jvm.cfg.
+	(stamps/add-zero.stamp): Install as shark if default vm is zero.
+	* configure.ac: Allow shark as additional vm when default vm is zero.
+	* INSTALL, README: Document new build options.
+
 2009-10-06  Gary Benson  <gbenson@redhat.com>
 
 	* patches/icedtea-s390-serialize.patch: New file.

--- a/INSTALL	Tue Oct 06 13:42:46 2009 +0100
+++ b/INSTALL	Thu Oct 08 13:08:52 2009 +0200
@@ -125,10 +125,13 @@
    --with-additional-vms=cacao
 to build the additional VM's.  It's not possible to build cacao as the
 default VM, and zero as additional VM.
+To build zero as the default VM and shark as an additional VM, use
+   --enable-zero --with-additional-vms=shark
 
 The additional VM's are available by calling the java with the option
-`-cacao' or `-zero' (for shark as well), or by calling the java tools with
-`-J-<vm name>'.
+`-cacao', `-zero' or `-shark', or by calling the java tools with
+`-J-<vm name>'. If the build was configured with '--enable-shark',
+use `-Xint' to just use the zero VM.
 
 Support for different versions of HotSpot
 ----------------------------------------- 

--- a/Makefile.am	Tue Oct 06 13:42:46 2009 +0100
+++ b/Makefile.am	Thu Oct 08 13:08:52 2009 +0200
@@ -1250,6 +1250,9 @@
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
+if SHARK_BUILD
+	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
 if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1339,6 +1342,9 @@
 if ZERO_BUILD
 	printf -- '-zero ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
+if SHARK_BUILD
+	printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
 if WITH_CACAO
 	printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
@@ -1940,12 +1946,20 @@
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_BUILD_TARGET)
 
+if ZERO_BUILD
+	mkdir -p $(BUILD_JRE_ARCH_DIR)/shark
+	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+		$(BUILD_JRE_ARCH_DIR)/shark/
+	printf -- '-shark KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
 	mkdir -p $(BUILD_JRE_ARCH_DIR)/zero
 	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_JRE_ARCH_DIR)/zero/
 	printf -- '-zero KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
 else
 	printf -- '-zero ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+	printf -- '-shark ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
 endif
 	touch $@
 
@@ -1960,12 +1974,20 @@
 	$(ADD_ZERO_EXTRA_BUILD_ENV) \
 		$(ARCH_PREFIX) $(MAKE) -C zerovm $(ICEDTEA_DEBUG_BUILD_TARGET)
 
+if ZERO_BUILD
+	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/shark
+	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
+		$(BUILD_DEBUG_JRE_ARCH_DIR)/shark/
+	printf -- '-shark KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+else
 	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/zero
 	cp -a zerovm/openjdk/build/$(OS_DIR)/hotspot/import/jre/lib/$(INSTALL_ARCH_DIR)/server/* \
 		$(BUILD_DEBUG_JRE_ARCH_DIR)/zero/
 	printf -- '-zero KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
 else
 	printf -- '-zero ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+	printf -- '-shark ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
 endif
 	touch $@
 

--- a/README	Tue Oct 06 13:42:46 2009 +0100
+++ b/README	Thu Oct 08 13:08:52 2009 +0200
@@ -153,13 +153,16 @@
 machine, addtional VM's can be built without building the other components
 multiple times.
 
-On architectures where hotspot is available, use 
+On architectures where hotspot is available, use
    --with-additional-vms=cacao,zero  (or shark instead of zero)
 on architectures where only zero (or shark) is available, use
-   --with-additional-vms=cacao  
-to build the additional VM's.  It's not possible to build cacao as the 
+   --with-additional-vms=cacao
+to build the additional VM's.  It's not possible to build cacao as the
 default VM, and zero as additional VM.
+To build zero as the default VM and shark as an additional VM, use
+   --enable-zero --with-additional-vms=shark
 
-If the build was configured with --with-additional-vms, the additional VM's
-are available by calling the java with the option `-cacao' or `-zero' (for
-shark as well), or by calling the java tools with `-J-<vm name>'.
+The additional VM's are available by calling the java with the option
+`-cacao', `-zero' or `-shark', or by calling the java tools with
+`-J-<vm name>'. If the build was configured with '--enable-shark',
+use `-Xint' to just use the zero VM.

--- a/configure.ac	Tue Oct 06 13:42:46 2009 +0100
+++ b/configure.ac	Thu Oct 08 13:08:52 2009 +0200
@@ -532,7 +532,10 @@
 if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then
   AC_MSG_ERROR([additional vm is the default vm])
 fi
-if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x; then
+if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" != x; then
+  AC_MSG_ERROR([additional vm is the default vm])
+fi
+if test "x${SHARK_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" = x; then
   AC_MSG_ERROR([additional vm is the default vm])
 fi
 if test "x${USE_SYSTEM_CACAO_TRUE}" = x; then