--- a/ChangeLog	Thu May 19 23:19:12 2011 +0100
+++ b/ChangeLog	Thu May 19 23:26:01 2011 +0100
@@ -1,3 +1,22 @@
+2011-02-23  Xerxes Ranby  <xerxes@zafena.se>
+
+	JamVM: Try --with-additional-vms=jamvm topping!
+	* NEWS: Updated.
+	* Makefile.am (stamps/add-jamvm.stamp): New make target.
+	(clean-add-jamvm): Likewise.
+	(stamps/add-jamvm-debug.stamp): Likewise.
+	(clean-add-jamvm-debug): Likewise.
+	(.PHONY): Add clean-add-jamvm and clean-add-jamvm-debug.
+	(stamps/icedtea-stage2.stamp): Add stamps/add-jamvm.stamp.
+	(clean-icedtea-stage2): Add clean-add-jamvm.
+	(stamps/icedtea-debug-stage2.stamp):
+	Add stamps/add-jamvm-debug.stamp.
+	(clean-icedtea-debug-stage2): Add clean-add-jamvm-debug.
+	* acinclude.m4 (IT_CHECK_ADDITIONAL_VMS):
+	Set add_vm_jamvm if jamvm are found.
+	(BUILD_JAMVM): Add check for add_vm_jamvm.
+	(ADD_JAMVM_BUILD): New conditional dependent on add_vm_jamvm.
+
 2011-02-22  Xerxes Ranby  <xranby@zafena.se>
 
 	Fix icedtea-boot build with --enable-jamvm

--- a/Makefile.am	Thu May 19 23:19:12 2011 +0100
+++ b/Makefile.am	Thu May 19 23:26:01 2011 +0100
@@ -755,7 +755,7 @@
 	clean-icedtea icedtea-stage2 clean-icedtea-boot \
 	clean-rt hotspot hotspot-helper clean-jtreg clean-jtreg-reports \
 	clean-drops jtregcheck clean-remove-intree-libraries \
-	clean-jamvm clean-extract-jamvm
+	clean-jamvm clean-extract-jamvm clean-add-jamvm clean-add-jamvm-debug
 
 env:
 	@echo 'unset JAVA_HOME'
@@ -1878,19 +1878,19 @@
 	rm -f stamps/icedtea.stamp stamps/icedtea-debug.stamp
 
 stamps/icedtea-stage2.stamp: stamps/icedtea.stamp stamps/add-cacao.stamp \
- stamps/add-zero.stamp
+ stamps/add-zero.stamp stamps/add-jamvm.stamp
 	mkdir -p stamps
 	touch $@
 
-clean-icedtea-stage2:
+clean-icedtea-stage2: clean-add-jamvm
 	rm -f stamps/icedtea-stage2.stamp
 
 stamps/icedtea-debug-stage2.stamp: stamps/icedtea-debug.stamp \
- stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp
+ stamps/add-cacao-debug.stamp stamps/add-zero-debug.stamp stamps/add-jamvm-debug.stamp
 	mkdir -p stamps
 	touch $@
 
-clean-icedtea-debug-stage2:
+clean-icedtea-debug-stage2: clean-add-jamvm-debug
 	rm -f stamps/icedtea-debug-stage2.stamp
 
 # OpenJDK boot Targets
@@ -2083,6 +2083,40 @@
 	rm -rf jamvm
 	rm -f stamps/jamvm.stamp
 
+# Targets for additional VMs
+
+stamps/add-jamvm.stamp: stamps/icedtea.stamp stamps/jamvm.stamp
+if ADD_JAMVM_BUILD
+	mkdir -p $(BUILD_JRE_ARCH_DIR)/jamvm
+	install -m 644 jamvm/install/lib/libjvm.so \
+		$(BUILD_JRE_ARCH_DIR)/jamvm/
+	printf -- '-jamvm KNOWN\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+else
+	printf -- '-jamvm ERROR\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg
+endif
+	touch $@
+
+clean-add-jamvm:
+	rm -rf $(BUILD_JRE_ARCH_DIR)/jamvm
+	sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg
+	rm -f stamps/add-jamvm.stamp
+
+stamps/add-jamvm-debug.stamp: stamps/icedtea-debug.stamp stamps/jamvm.stamp
+if ADD_JAMVM_BUILD
+	mkdir -p $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
+	install -m 644 jamvm/install/lib/libjvm.so \
+		$(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm/
+	printf -- '-jamvm KNOWN\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+else
+	printf -- '-jamvm ERROR\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg
+endif
+	touch $@
+
+clean-add-jamvm-debug:
+	rm -rf $(BUILD_DEBUG_JRE_ARCH_DIR)/jamvm
+	sed -i 's#-jamvm KNOWN#-jamvm ERROR#' jvm.cfg
+	rm -f stamps/add-jamvm-debug.stamp
+
 # CACAO
 
 stamps/cacao.stamp: stamps/rt.stamp

--- a/NEWS	Thu May 19 23:19:12 2011 +0100
+++ b/NEWS	Thu May 19 23:26:01 2011 +0100
@@ -3,6 +3,7 @@
 * NetX and the plugin moved to the IcedTea-Web project with a separate
   release cycle.
 * Added out-of-the-box JamVM support using --enable-jamvm
+* Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm
 * Bug fixes
   - PR616, PR99: Don't statically link libstdc++
 * Zero/Shark

--- a/acinclude.m4	Thu May 19 23:19:12 2011 +0100
+++ b/acinclude.m4	Thu May 19 23:26:01 2011 +0100
@@ -1272,7 +1272,7 @@
 AC_MSG_CHECKING([for additional virtual machines to build])
 AC_ARG_WITH(additional-vms,
             AC_HELP_STRING([--with-additional-vms=VM-LIST],
-	    [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `zero' and `shark'.]),
+	    [build additional virtual machines. Valid value is a comma separated string with the backend names `cacao', `jamvm', `zero' and `shark'.]),
 [
 if test "x${withval}" != x ; then
   with_additional_vms=${withval}
@@ -1281,6 +1281,7 @@
       xcacao) add_vm_cacao=yes;;
       xzero)  add_vm_zero=yes;;
       xshark) add_vm_shark=yes;;
+      xjamvm) add_vm_jamvm=yes;;
       *) AC_MSG_ERROR([proper usage is --with-additional-vms=vm1,vm2,...])
     esac
   done
@@ -1291,12 +1292,16 @@
 fi
 AC_MSG_RESULT($with_additional_vms)
 
+AM_CONDITIONAL(ADD_JAMVM_BUILD, test x$add_vm_jamvm != x)
 AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x)
 AM_CONDITIONAL(ADD_ZERO_BUILD,  test x$add_vm_zero  != x || test x$add_vm_shark != x)
 AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x)
-AM_CONDITIONAL(BUILD_JAMVM, test "x${ENABLE_JAMVM}" = xyes)
+AM_CONDITIONAL(BUILD_JAMVM, test x$add_vm_jamvm != x || test "x${ENABLE_JAMVM}" = xyes)
 AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes)
 
+if test "x${ENABLE_JAMVM}" = xyes && test "x${ADD_JAMVM_BUILD_TRUE}" = x; then
+  AC_MSG_ERROR([additional vm is the default vm])
+fi
 if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then
   AC_MSG_ERROR([additional vm is the default vm])
 fi