Mercurial > hg > release > icedtea7-2.0
changeset 2425:97063b48abc0
Replace WITH_CACAO with more accurate ENABLE_CACAO.
2011-02-22 Andrew John Hughes <ahughes@redhat.com>
Use more accurate ENABLE_CACAO rather
than WITH_CACAO.
* Makefile.am:
Replace WITH_CACAO throughout.
* acinclude.m4: Likewise.
author | Andrew John Hughes <ahughes@redhat.com> |
---|---|
date | Wed, 25 May 2011 01:42:05 +0100 |
parents | c12aafe2de1b |
children | de13896b4712 |
files | ChangeLog Makefile.am acinclude.m4 |
diffstat | 3 files changed, 23 insertions(+), 15 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Tue Feb 22 12:52:39 2011 +0000 +++ b/ChangeLog Wed May 25 01:42:05 2011 +0100 @@ -1,3 +1,11 @@ +2011-02-22 Andrew John Hughes <ahughes@redhat.com> + + Use more accurate ENABLE_CACAO rather + than WITH_CACAO. + * Makefile.am: + Replace WITH_CACAO throughout. + * acinclude.m4: Likewise. + 2011-02-22 Andrew John Hughes <ahughes@redhat.com> PR497: Mercurial revision detection not very reliable
--- a/Makefile.am Tue Feb 22 12:52:39 2011 +0000 +++ b/Makefile.am Wed May 25 01:42:05 2011 +0100 @@ -176,7 +176,7 @@ PREFER_SOURCE = -Xprefer:source endif -if WITH_CACAO +if ENABLE_CACAO ICEDTEA_BUILD_TARGET = jdk_only ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only else @@ -304,7 +304,7 @@ patches/cacao/memory.patch endif -if WITH_CACAO +if ENABLE_CACAO ICEDTEA_PATCHES += \ patches/cacao/ignore-tests.patch endif @@ -480,7 +480,7 @@ VERBOSE="$(VERBOSE)" \ STATIC_CXX="false" -if WITH_CACAO +if ENABLE_CACAO ICEDTEA_ENV += \ ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)" endif @@ -1480,7 +1480,7 @@ mv openjdk/jdk/make/common/shared/Defs.gmk Defs.gmk.bak cat Defs.gmk.bak > openjdk/jdk/make/common/shared/Defs.gmk icedtea_version="$(PACKAGE_VERSION)$(ICEDTEA_REV)" ; \ - if test "x$(WITH_CACAO)" = "xyes" || \ + if test "x$(ENABLE_CACAO)" = "xyes" || \ test "x$(ENABLE_JAMVM)" = "xyes"; then \ echo "JDK_DERIVATIVE_NAME=$${icedtea_version}" \ >>openjdk/jdk/make/common/shared/Defs.gmk ; \ @@ -1796,7 +1796,7 @@ if SHARK_BUILD printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif -if WITH_CACAO +if ENABLE_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_JRE_ARCH_DIR)/jvm.cfg endif if ENABLE_SYSTEMTAP @@ -1861,7 +1861,7 @@ if SHARK_BUILD printf -- '-shark ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif -if WITH_CACAO +if ENABLE_CACAO printf -- '-cacao ALIASED_TO -server\n' >> $(BUILD_DEBUG_JRE_ARCH_DIR)/jvm.cfg endif if ENABLE_SYSTEMTAP @@ -2366,7 +2366,7 @@ check-jdk: stamps/jtreg.stamp mkdir -p test/jdk/JTwork test/jdk/JTreport -if WITH_CACAO +if ENABLE_CACAO CACAO_EXCLUDE="-exclude:$(abs_top_srcdir)/test/jtreg/excludelist.jdk.cacao.jtx" endif if test "x$${DISPLAY}" = "x"; then XVFB_RUN="@XVFB_RUN_CMD@"; fi; \
--- a/acinclude.m4 Tue Feb 22 12:52:39 2011 +0000 +++ b/acinclude.m4 Wed May 25 01:42:05 2011 +0100 @@ -751,7 +751,7 @@ sparc*-*-*) ;; x86_64-*-*) ;; *) - if test "x${WITH_CACAO}" != xno || \ + if test "x${ENABLE_CACAO}" != xno || \ test "x${ENABLE_JAMVM}" = xyes; then use_zero=no else @@ -830,15 +830,15 @@ AC_ARG_ENABLE([cacao], [AS_HELP_STRING(--enable-cacao,use CACAO as VM [[default=no]])], [ - WITH_CACAO="${enableval}" + ENABLE_CACAO="${enableval}" ], [ - WITH_CACAO=no + ENABLE_CACAO=no ]) - AC_MSG_RESULT(${WITH_CACAO}) - AM_CONDITIONAL(WITH_CACAO, test x"${WITH_CACAO}" = "xyes") - AC_SUBST(WITH_CACAO) + AC_MSG_RESULT(${ENABLE_CACAO}) + AM_CONDITIONAL(ENABLE_CACAO, test x"${ENABLE_CACAO}" = "xyes") + AC_SUBST(ENABLE_CACAO) ]) AC_DEFUN([IT_CHECK_WITH_CACAO_HOME], @@ -1333,13 +1333,13 @@ AM_CONDITIONAL(ADD_CACAO_BUILD, test x$add_vm_cacao != x) AM_CONDITIONAL(ADD_ZERO_BUILD, test x$add_vm_zero != x || test x$add_vm_shark != x) AM_CONDITIONAL(ADD_SHARK_BUILD, test x$add_vm_shark != x) +AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${ENABLE_CACAO}" = xyes) AM_CONDITIONAL(BUILD_JAMVM, test x$add_vm_jamvm != x || test "x${ENABLE_JAMVM}" = xyes) -AM_CONDITIONAL(BUILD_CACAO, test x$add_vm_cacao != x || test "x${WITH_CACAO}" = xyes) if test "x${ENABLE_JAMVM}" = xyes && test "x${ADD_JAMVM_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi -if test "x${WITH_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then +if test "x${ENABLE_CACAO}" = xyes && test "x${ADD_CACAO_BUILD_TRUE}" = x; then AC_MSG_ERROR([additional vm is the default vm]) fi if test "x${ZERO_BUILD_TRUE}" = x && test "x${ADD_ZERO_BUILD_TRUE}" = x && test "x${ADD_SHARK_BUILD_TRUE}" != x; then