equal
deleted
inserted
replaced
631 LIBOBJS |
631 LIBOBJS |
632 CCACHE |
632 CCACHE |
633 USE_PRECOMPILED_HEADER |
633 USE_PRECOMPILED_HEADER |
634 SJAVAC_SERVER_DIR |
634 SJAVAC_SERVER_DIR |
635 ENABLE_SJAVAC |
635 ENABLE_SJAVAC |
|
636 SJAVAC_SERVER_JAVA_FLAGS |
636 SJAVAC_SERVER_JAVA |
637 SJAVAC_SERVER_JAVA |
637 JAVA_TOOL_FLAGS_SMALL |
638 JAVA_TOOL_FLAGS_SMALL |
638 JAVA_FLAGS_SMALL |
639 JAVA_FLAGS_SMALL |
639 JAVA_FLAGS_BIG |
640 JAVA_FLAGS_BIG |
640 JAVA_FLAGS |
641 JAVA_FLAGS |
4325 # definitions. It is replaced with custom functionality when building |
4326 # definitions. It is replaced with custom functionality when building |
4326 # custom sources. |
4327 # custom sources. |
4327 #CUSTOM_AUTOCONF_INCLUDE |
4328 #CUSTOM_AUTOCONF_INCLUDE |
4328 |
4329 |
4329 # Do not change or remove the following line, it is needed for consistency checks: |
4330 # Do not change or remove the following line, it is needed for consistency checks: |
4330 DATE_WHEN_GENERATED=1410791401 |
4331 DATE_WHEN_GENERATED=1412599039 |
4331 |
4332 |
4332 ############################################################################### |
4333 ############################################################################### |
4333 # |
4334 # |
4334 # Initialization / Boot-strapping |
4335 # Initialization / Boot-strapping |
4335 # |
4336 # |
50470 $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5 |
50471 $ECHO "Command: $SJAVAC_SERVER_JAVA -d64 -version" >&5 |
50471 OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1` |
50472 OUTPUT=`$SJAVAC_SERVER_JAVA -d64 -version 2>&1` |
50472 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
50473 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
50473 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
50474 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
50474 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
50475 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
50475 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -d64" |
50476 SJAVAC_SERVER_JAVA_FLAGS="$SJAVAC_SERVER_JAVA_FLAGS -d64" |
50476 JVM_ARG_OK=true |
50477 JVM_ARG_OK=true |
50477 else |
50478 else |
50478 $ECHO "Arg failed:" >&5 |
50479 $ECHO "Arg failed:" >&5 |
50479 $ECHO "$OUTPUT" >&5 |
50480 $ECHO "$OUTPUT" >&5 |
50480 JVM_ARG_OK=false |
50481 JVM_ARG_OK=false |
50508 $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms${MS_VALUE}M -Xmx${MX_VALUE}M -version" >&5 |
50509 $ECHO "Command: $SJAVAC_SERVER_JAVA -Xms${MS_VALUE}M -Xmx${MX_VALUE}M -version" >&5 |
50509 OUTPUT=`$SJAVAC_SERVER_JAVA -Xms${MS_VALUE}M -Xmx${MX_VALUE}M -version 2>&1` |
50510 OUTPUT=`$SJAVAC_SERVER_JAVA -Xms${MS_VALUE}M -Xmx${MX_VALUE}M -version 2>&1` |
50510 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
50511 FOUND_WARN=`$ECHO "$OUTPUT" | grep -i warn` |
50511 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
50512 FOUND_VERSION=`$ECHO $OUTPUT | grep " version \""` |
50512 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
50513 if test "x$FOUND_VERSION" != x && test "x$FOUND_WARN" = x; then |
50513 SJAVAC_SERVER_JAVA="$SJAVAC_SERVER_JAVA -Xms${MS_VALUE}M -Xmx${MX_VALUE}M" |
50514 SJAVAC_SERVER_JAVA_FLAGS="$SJAVAC_SERVER_JAVA_FLAGS -Xms${MS_VALUE}M -Xmx${MX_VALUE}M" |
50514 JVM_ARG_OK=true |
50515 JVM_ARG_OK=true |
50515 else |
50516 else |
50516 $ECHO "Arg failed:" >&5 |
50517 $ECHO "Arg failed:" >&5 |
50517 $ECHO "$OUTPUT" >&5 |
50518 $ECHO "$OUTPUT" >&5 |
50518 JVM_ARG_OK=false |
50519 JVM_ARG_OK=false |
50519 fi |
50520 fi |
|
50521 |
50520 |
50522 |
50521 |
50523 |
50522 # Check whether --enable-sjavac was given. |
50524 # Check whether --enable-sjavac was given. |
50523 if test "${enable_sjavac+set}" = set; then : |
50525 if test "${enable_sjavac+set}" = set; then : |
50524 enableval=$enable_sjavac; ENABLE_SJAVAC="${enableval}" |
50526 enableval=$enable_sjavac; ENABLE_SJAVAC="${enableval}" |