/hg/icedtea6: Replace WITH_CACAO with more accurate ENABLE_CACAO.

[andrew at icedtea.classpath.org]

changeset 69e952bd19fd in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=69e952bd19fd
author: Andrew John Hughes <ahughes at redhat.com>
date: Wed Feb 23 13:55:40 2011 +0000

	Replace WITH_CACAO with more accurate ENABLE_CACAO.

	2011-02-22 Andrew John Hughes <ahughes at redhat.com>

	 Use more accurate ENABLE_CACAO rather than
	WITH_CACAO.
		* Makefile.am: Replace WITH_CACAO throughout.
		* acinclude.m4: Likewise.


diffstat:

3 files changed, 22 insertions(+), 14 deletions(-)
ChangeLog    |    8 ++++++++
Makefile.am  |   12 ++++++------
acinclude.m4 |   16 ++++++++--------

diffs (121 lines):

diff -r a82e71679b03 -r 69e952bd19fd ChangeLog
--- a/ChangeLog	Wed Feb 23 12:30:22 2011 +0100
+++ b/ChangeLog	Wed Feb 23 13:55:40 2011 +0000
@@ -1,3 +1,11 @@ 2011-02-23  Xerxes Ranby  <xerxes at zafena
+2011-02-22  Andrew John Hughes  <ahughes at redhat.com>
+
+	Use more accurate ENABLE_CACAO rather
+	than WITH_CACAO.
+	* Makefile.am:
+	Replace WITH_CACAO throughout.
+	* acinclude.m4: Likewise.
+
 2011-02-23  Xerxes Ranby  <xerxes at zafena.se>
 
 	JamVM: Try --with-additional-vms=jamvm topping!
diff -r a82e71679b03 -r 69e952bd19fd Makefile.am
--- a/Makefile.am	Wed Feb 23 12:30:22 2011 +0100
+++ b/Makefile.am	Wed Feb 23 13:55:40 2011 +0000
@@ -134,7 +134,7 @@ else
   MEMORY_LIMIT = -J-Xmx1024m
 endif
 
-if WITH_CACAO
+if ENABLE_CACAO
   ICEDTEA_BUILD_TARGET=jdk_only
   ICEDTEA_DEBUG_BUILD_TARGET = jdk_fastdebug_only
 else
@@ -350,7 +350,7 @@ ICEDTEA_PATCHES += \
 	patches/cacao/arm-jvm.cfg-pr600.patch
 endif
 
-if WITH_CACAO
+if ENABLE_CACAO
 ICEDTEA_PATCHES += \
 	patches/cacao/ignore-jdi-tests.patch \
 	patches/cacao/ignore-tests.patch
@@ -485,7 +485,7 @@ ICEDTEA_ENV = \
 	VERBOSE="$(VERBOSE)" \
 	ALT_OUTPUTDIR="$(BUILD_OUTPUT_DIR)"
 
-if WITH_CACAO
+if ENABLE_CACAO
 ICEDTEA_ENV += \
 	ALT_HOTSPOT_IMPORT_PATH="$(CACAO_IMPORT_PATH)"
 endif
@@ -1086,7 +1086,7 @@ stamps/patch.stamp: stamps/patch-fsg.sta
 	fi
 
 	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 ; \
@@ -1330,7 +1330,7 @@ if SHARK_BUILD
 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_JAMVM
@@ -1361,7 +1361,7 @@ if SHARK_BUILD
 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_JAMVM
diff -r a82e71679b03 -r 69e952bd19fd acinclude.m4
--- a/acinclude.m4	Wed Feb 23 12:30:22 2011 +0100
+++ b/acinclude.m4	Wed Feb 23 13:55:40 2011 +0000
@@ -783,7 +783,7 @@ AC_DEFUN([IT_ENABLE_ZERO_BUILD],
         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
@@ -881,15 +881,15 @@ AC_DEFUN([IT_CHECK_ENABLE_CACAO],
   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],
@@ -1223,13 +1223,13 @@ AM_CONDITIONAL(ADD_CACAO_BUILD, test x$a
 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