--- a/common/autoconf/build-performance.m4	Tue Nov 24 17:45:59 2015 +0100
+++ b/common/autoconf/build-performance.m4	Wed Nov 25 15:56:29 2015 +0100
@@ -411,9 +411,9 @@
   AC_MSG_RESULT([$ENABLE_SJAVAC])
   AC_SUBST(ENABLE_SJAVAC)
 
-  AC_ARG_ENABLE([javac-server], [AS_HELP_STRING([--enable-javac-server],
-      [use only the server part of sjavac for faster javac compiles @<:@disabled@:>@])],
-      [ENABLE_JAVAC_SERVER="${enableval}"], [ENABLE_JAVAC_SERVER="no"])
+  AC_ARG_ENABLE([javac-server], [AS_HELP_STRING([--disable-javac-server],
+      [disable javac server @<:@enabled@:>@])],
+      [ENABLE_JAVAC_SERVER="${enableval}"], [ENABLE_JAVAC_SERVER="yes"])
   if test "x$JVM_ARG_OK" = "xfalse"; then
     AC_MSG_WARN([Could not set -Xms${MS_VALUE}M -Xmx${MX_VALUE}M, disabling javac server])
     ENABLE_JAVAC_SERVER="no"

--- a/common/autoconf/generated-configure.sh	Tue Nov 24 17:45:59 2015 +0100
+++ b/common/autoconf/generated-configure.sh	Wed Nov 25 15:56:29 2015 +0100
@@ -1886,8 +1886,7 @@
                           --with-freetype, disabled otherwise]
   --enable-sjavac         use sjavac to do fast incremental compiles
                           [disabled]
-  --enable-javac-server   use only the server part of sjavac for faster javac
-                          compiles [disabled]
+  --disable-javac-server  disable javac server [enabled]
   --enable-icecc          enable distribted compilation of native code using
                           icecc/icecream [disabled]
   --disable-precompiled-headers
@@ -4641,7 +4640,7 @@
 #CUSTOM_AUTOCONF_INCLUDE
 
 # Do not change or remove the following line, it is needed for consistency checks:
-DATE_WHEN_GENERATED=1448383548
+DATE_WHEN_GENERATED=1448463381
 
 ###############################################################################
 #
@@ -56658,7 +56657,7 @@
 if test "${enable_javac_server+set}" = set; then :
   enableval=$enable_javac_server; ENABLE_JAVAC_SERVER="${enableval}"
 else
-  ENABLE_JAVAC_SERVER="no"
+  ENABLE_JAVAC_SERVER="yes"
 fi
 
   if test "x$JVM_ARG_OK" = "xfalse"; then