--- old/make/defs.make	2012-03-12 13:02:24.203701306 +0100
+++ new/make/defs.make	2012-03-12 13:02:24.073681954 +0100
@@ -55,6 +55,32 @@
 @$(RM) $@
 endef
 
+# Default values for JVM_VARIANT* variables if configure hasn't set
+# it already.
+ifeq ($(JVM_VARIANTS),)
+  ifeq ($(ZERO_BUILD), true)
+    JVM_VARIANTS:=zero
+    JVM_VARIANT_ZERO:=true
+  endif
+  ifeq ($(SHARK_BUILD), true)
+    JVM_VARIANTS:=zeroshark
+    JVM_VARIANT_ZEROSHARK:=true
+  endif
+  ifeq ($(KERNEL_BUILD), true)
+    JVM_VARIANTS:=minimal
+    JVM_VARIANT_MINIMAL:=true
+  endif
+  # If none of the above were set
+  ifeq ($(ZERO_BUILD)$(KERNEL_BUILD)$(SHARK_BUILD),)
+    # A default is needed
+    ifeq ($(BUILD_CLIENT_ONLY), true)
+      JVM_VARIANTS:=client
+      JVM_VARIANT_CLIENT:=true
+    endif
+    # Further defaults are platform and arch specific
+  endif
+endif
+
 # Directory paths and user name
 # Unless GAMMADIR is set on the command line, search upward from
 # the current directory for a parent directory containing "src/share/vm".