--- old/common/autoconf/generated-configure.sh	2016-04-17 12:31:58.526611372 -0400
+++ new/common/autoconf/generated-configure.sh	2016-04-17 12:31:58.415609963 -0400
@@ -4964,7 +4964,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1460713327
+DATE_WHEN_GENERATED=1460908952
 
 ###############################################################################
 #
@@ -62563,7 +62563,7 @@
 $as_echo "$ENABLE_JAVAC_SERVER" >&6; }
 
 
-  if test "x$ENABLE_JAVAC_SERVER" = "xyes" || "x$ENABLE_SJAVAC" = "xyes"; then
+  if test "x$ENABLE_JAVAC_SERVER" = "xyes" || test "x$ENABLE_SJAVAC" = "xyes"; then
     # When using a server javac, the small client instances do not need much
     # resources.
     JAVA_FLAGS_JAVAC="$JAVA_FLAGS_SMALL"