equal
deleted
inserted
replaced
294 SJAVAC_SERVER_JAVA="$JAVA" |
294 SJAVAC_SERVER_JAVA="$JAVA" |
295 fi |
295 fi |
296 AC_SUBST(SJAVAC_SERVER_JAVA) |
296 AC_SUBST(SJAVAC_SERVER_JAVA) |
297 |
297 |
298 if test "$MEMORY_SIZE" -gt "3000"; then |
298 if test "$MEMORY_SIZE" -gt "3000"; then |
299 ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
299 ADD_JVM_ARG_IF_OK([-d64],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA]) |
300 if test "$JVM_ARG_OK" = true; then |
300 if test "$JVM_ARG_OK" = true; then |
301 JVM_64BIT=true |
301 JVM_64BIT=true |
302 JVM_ARG_OK=false |
302 JVM_ARG_OK=false |
303 fi |
303 fi |
304 fi |
304 fi |
318 fi |
318 fi |
319 fi |
319 fi |
320 if test "$MX_VALUE" -lt "512"; then |
320 if test "$MX_VALUE" -lt "512"; then |
321 MX_VALUE=512 |
321 MX_VALUE=512 |
322 fi |
322 fi |
323 ADD_JVM_ARG_IF_OK([-Xms${MS_VALUE}M -Xmx${MX_VALUE}M],SJAVAC_SERVER_JAVA,[$SJAVAC_SERVER_JAVA]) |
323 ADD_JVM_ARG_IF_OK([-Xms${MS_VALUE}M -Xmx${MX_VALUE}M],SJAVAC_SERVER_JAVA_FLAGS,[$SJAVAC_SERVER_JAVA]) |
|
324 AC_SUBST(SJAVAC_SERVER_JAVA_FLAGS) |
324 |
325 |
325 AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], |
326 AC_ARG_ENABLE([sjavac], [AS_HELP_STRING([--enable-sjavac], |
326 [use sjavac to do fast incremental compiles @<:@disabled@:>@])], |
327 [use sjavac to do fast incremental compiles @<:@disabled@:>@])], |
327 [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) |
328 [ENABLE_SJAVAC="${enableval}"], [ENABLE_SJAVAC='no']) |
328 if test "x$JVM_ARG_OK" = "xfalse"; then |
329 if test "x$JVM_ARG_OK" = "xfalse"; then |