changeset in /hg/icedtea6: Fix naming of cacao option.

[Andrew John Hughes]

changeset 839e9e0810ca in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=839e9e0810ca
description:
	Fix naming of cacao option.

	2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* acinclude.m4:
		Change --with-cacao to be --enable-cacao
		as it only accepts yes and no.
		* configure.ac:
		Rename cacao macro appropriately.

diffstat:

3 files changed, 14 insertions(+), 6 deletions(-)
ChangeLog    |    8 ++++++++
acinclude.m4 |   10 +++++-----
configure.ac |    2 +-

diffs (49 lines):

diff -r ce3ea0b5a8c9 -r 839e9e0810ca ChangeLog
--- a/ChangeLog	Thu Oct 16 01:28:18 2008 +0100
+++ b/ChangeLog	Thu Oct 16 01:44:33 2008 +0100
@@ -1,3 +1,11 @@ 2008-10-16  Andrew John Hughes  <gnu_and
+2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* acinclude.m4:
+	Change --with-cacao to be --enable-cacao
+	as it only accepts yes and no.
+	* configure.ac:
+	Rename cacao macro appropriately.
+
 2008-10-16  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r ce3ea0b5a8c9 -r 839e9e0810ca acinclude.m4
--- a/acinclude.m4	Thu Oct 16 01:28:18 2008 +0100
+++ b/acinclude.m4	Thu Oct 16 01:44:33 2008 +0100
@@ -847,13 +847,13 @@ AC_DEFUN([SET_CORE_OR_SHARK_BUILD],
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
 ])
 
-AC_DEFUN([AC_CHECK_WITH_CACAO],
+AC_DEFUN([AC_CHECK_ENABLE_CACAO],
 [
   AC_MSG_CHECKING(whether to use CACAO as VM)
-  AC_ARG_WITH([cacao],
-	      [AS_HELP_STRING(--with-cacao,use CACAO as VM [[default=no]])],
-  [
-    WITH_CACAO=yes
+  AC_ARG_ENABLE([cacao],
+	      [AS_HELP_STRING(--enable-cacao,use CACAO as VM [[default=no]])],
+  [
+    WITH_CACAO="${enableval}"
   ],
   [
     WITH_CACAO=no
diff -r ce3ea0b5a8c9 -r 839e9e0810ca configure.ac
--- a/configure.ac	Thu Oct 16 01:28:18 2008 +0100
+++ b/configure.ac	Thu Oct 16 01:44:33 2008 +0100
@@ -249,7 +249,7 @@ WITH_NETBEANS_PROFILER_SRC_ZIP
 WITH_NETBEANS_PROFILER_SRC_ZIP
 WITH_NETBEANS_BASIC_CLUSTER_SRC_ZIP
 WITH_ALT_JAR_BINARY
-AC_CHECK_WITH_CACAO
+AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
 ENABLE_OPTIMIZATIONS