# HG changeset patch # User ihse # Date 1486131578 -3600 # Node ID 509c3ebb5c9727281b084d4fbd5e4b25f6aa7e85 # Parent 0fa3d82acf45d68a9ad914a5c1ed086a1d872ab5 8004842: Unify values of boolean make variables set in configure to true/false Reviewed-by: erikj diff -r 0fa3d82acf45 -r 509c3ebb5c97 common/autoconf/build-performance.m4 --- a/common/autoconf/build-performance.m4 Fri Feb 03 14:34:00 2017 +0100 +++ b/common/autoconf/build-performance.m4 Fri Feb 03 15:19:38 2017 +0100 @@ -224,7 +224,7 @@ AC_MSG_ERROR([On macosx, ccache 3.2 or later is required, found $CCACHE_VERSION]) fi fi - if test "x$USE_PRECOMPILED_HEADER" = "x1"; then + if test "x$USE_PRECOMPILED_HEADER" = "xtrue"; then HAS_BAD_CCACHE=[`$ECHO $CCACHE_VERSION | \ $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'`] if test "x$HAS_BAD_CCACHE" != "x"; then @@ -362,20 +362,20 @@ [disable using precompiled headers when compiling C++ @<:@enabled@:>@])], [ENABLE_PRECOMPH=${enable_precompiled_headers}], [ENABLE_PRECOMPH=yes]) - USE_PRECOMPILED_HEADER=1 + USE_PRECOMPILED_HEADER=true AC_MSG_CHECKING([If precompiled header is enabled]) if test "x$ENABLE_PRECOMPH" = xno; then AC_MSG_RESULT([no, forced]) - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false elif test "x$ICECC" != "x"; then AC_MSG_RESULT([no, does not work effectively with icecc]) - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then AC_MSG_RESULT([no, does not work with Solaris Studio]) - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false elif test "x$TOOLCHAIN_TYPE" = xxlc; then AC_MSG_RESULT([no, does not work with xlc]) - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false else AC_MSG_RESULT([yes]) fi @@ -387,7 +387,7 @@ echo "int alfa();" > conftest.h $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&AS_MESSAGE_LOG_FD >&AS_MESSAGE_LOG_FD if test ! -f conftest.hpp.gch; then - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false AC_MSG_RESULT([no]) else AC_MSG_RESULT([yes]) diff -r 0fa3d82acf45 -r 509c3ebb5c97 common/autoconf/generated-configure.sh --- a/common/autoconf/generated-configure.sh Fri Feb 03 14:34:00 2017 +0100 +++ b/common/autoconf/generated-configure.sh Fri Feb 03 15:19:38 2017 +0100 @@ -5170,7 +5170,7 @@ #CUSTOM_AUTOCONF_INCLUDE # Do not change or remove the following line, it is needed for consistency checks: -DATE_WHEN_GENERATED=1486033520 +DATE_WHEN_GENERATED=1486131554 ############################################################################### # @@ -64466,11 +64466,11 @@ $as_echo_n "checking if elliptic curve crypto implementation is present... " >&6; } if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then - ENABLE_INTREE_EC=yes + ENABLE_INTREE_EC=true { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } else - ENABLE_INTREE_EC=no + ENABLE_INTREE_EC=false { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi @@ -65837,25 +65837,25 @@ fi - USE_PRECOMPILED_HEADER=1 + USE_PRECOMPILED_HEADER=true { $as_echo "$as_me:${as_lineno-$LINENO}: checking If precompiled header is enabled" >&5 $as_echo_n "checking If precompiled header is enabled... " >&6; } if test "x$ENABLE_PRECOMPH" = xno; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, forced" >&5 $as_echo "no, forced" >&6; } - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false elif test "x$ICECC" != "x"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, does not work effectively with icecc" >&5 $as_echo "no, does not work effectively with icecc" >&6; } - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, does not work with Solaris Studio" >&5 $as_echo "no, does not work with Solaris Studio" >&6; } - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false elif test "x$TOOLCHAIN_TYPE" = xxlc; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no, does not work with xlc" >&5 $as_echo "no, does not work with xlc" >&6; } - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false else { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -65869,7 +65869,7 @@ echo "int alfa();" > conftest.h $CXX -x c++-header conftest.h -o conftest.hpp.gch 2>&5 >&5 if test ! -f conftest.hpp.gch; then - USE_PRECOMPILED_HEADER=0 + USE_PRECOMPILED_HEADER=false { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } else @@ -66156,7 +66156,7 @@ as_fn_error $? "On macosx, ccache 3.2 or later is required, found $CCACHE_VERSION" "$LINENO" 5 fi fi - if test "x$USE_PRECOMPILED_HEADER" = "x1"; then + if test "x$USE_PRECOMPILED_HEADER" = "xtrue"; then HAS_BAD_CCACHE=`$ECHO $CCACHE_VERSION | \ $GREP -e '^1.*' -e '^2.*' -e '^3\.0.*' -e '^3\.1\.[0123]$'` if test "x$HAS_BAD_CCACHE" != "x"; then diff -r 0fa3d82acf45 -r 509c3ebb5c97 common/autoconf/jdk-options.m4 --- a/common/autoconf/jdk-options.m4 Fri Feb 03 14:34:00 2017 +0100 +++ b/common/autoconf/jdk-options.m4 Fri Feb 03 15:19:38 2017 +0100 @@ -210,10 +210,10 @@ AC_MSG_CHECKING([if elliptic curve crypto implementation is present]) if test -d "${SRC_ROOT}/jdk/src/jdk.crypto.ec/share/native/libsunec/impl"; then - ENABLE_INTREE_EC=yes + ENABLE_INTREE_EC=true AC_MSG_RESULT([yes]) else - ENABLE_INTREE_EC=no + ENABLE_INTREE_EC=false AC_MSG_RESULT([no]) fi diff -r 0fa3d82acf45 -r 509c3ebb5c97 common/autoconf/spec.gmk.in --- a/common/autoconf/spec.gmk.in Fri Feb 03 14:34:00 2017 +0100 +++ b/common/autoconf/spec.gmk.in Fri Feb 03 15:19:38 2017 +0100 @@ -682,7 +682,7 @@ # Build setup ENABLE_AOT:=@ENABLE_AOT@ -ENABLE_INTREE_EC=@ENABLE_INTREE_EC@ +ENABLE_INTREE_EC:=@ENABLE_INTREE_EC@ USE_EXTERNAL_LIBJPEG:=@USE_EXTERNAL_LIBJPEG@ USE_EXTERNAL_LIBGIF:=@USE_EXTERNAL_LIBGIF@ USE_EXTERNAL_LIBZ:=@USE_EXTERNAL_LIBZ@ diff -r 0fa3d82acf45 -r 509c3ebb5c97 make/common/NativeCompilation.gmk --- a/make/common/NativeCompilation.gmk Fri Feb 03 14:34:00 2017 +0100 +++ b/make/common/NativeCompilation.gmk Fri Feb 03 15:19:38 2017 +0100 @@ -685,7 +685,7 @@ $$($1_OBJECT_DIR)/$$($1_NOSUFFIX).comp.vardeps) ifneq ($$($1_PRECOMPILED_HEADER), ) - ifeq ($(USE_PRECOMPILED_HEADER), 1) + ifeq ($(USE_PRECOMPILED_HEADER), true) ifeq ($(TOOLCHAIN_TYPE), microsoft) $1_PCH_FILE := $$($1_OBJECT_DIR)/$1.pch $1_GENERATED_PCH_SRC := $$($1_OBJECT_DIR)/$1_pch.cpp