diff -r 3b8ffb80db0f -r 653ff6bcf0b1 common/autoconf/jdk-options.m4
--- a/common/autoconf/jdk-options.m4	Fri Apr 05 09:38:54 2013 +0200
+++ b/common/autoconf/jdk-options.m4	Mon Apr 08 14:07:32 2013 -0400
@@ -121,6 +121,15 @@
 AC_SUBST(JVM_VARIANT_ZERO)
 AC_SUBST(JVM_VARIANT_ZEROSHARK)
 
+INCLUDE_SA=true
+if test "x$JVM_VARIANT_ZERO" = xtrue ; then
+    INCLUDE_SA=false
+fi
+if test "x$JVM_VARIANT_ZEROSHARK" = xtrue ; then
+    INCLUDE_SA=false
+fi
+AC_SUBST(INCLUDE_SA)
+
 if test "x$OPENJDK_TARGET_OS" = "xmacosx"; then
    MACOSX_UNIVERSAL="true"
 fi