--- a/ChangeLog	Wed Oct 19 03:24:31 2011 +0100
+++ b/ChangeLog	Wed Oct 19 03:31:42 2011 +0100
@@ -1,3 +1,13 @@
+2011-10-19  Andrew John Hughes  <ahughes@redhat.com>
+
+	Disable CACAO due to
+	http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=154
+	* README: Mention that CACAO is disabled
+	and correct option name.
+	* acinclude.m4:
+	(IT_ENABLE_CACAO): Exit with an error if CACAO
+	is enabled.
+
 2011-10-19  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am: Bring in security updates.

--- a/README	Wed Oct 19 03:24:31 2011 +0100
+++ b/README	Wed Oct 19 03:31:42 2011 +0100
@@ -75,13 +75,16 @@
 alternative to the HotSpot virtual machine. One advantage of this is
 that it already provides a JIT for many platforms to which HotSpot has
 not yet been ported, including ppc, ppc64, arm and mips.  To use CACAO
-as the VM, use the --with-cacao option.  This will download a snapshot
+as the VM, use the --enable-cacao option.  This will download a snapshot
 of CACAO during the build, which has been tested with this version of
 IcedTea7.
 
 The environment variable CACAO_CONFIGURE_ARGS can be used to pass
 additional arguments to the cacao configure.
 
+Note that CACAO support is currently disabled as it does not yet support
+OpenJDK7; see http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=154.
+
 PulseAudio Mixer
 ================
 

--- a/acinclude.m4	Wed Oct 19 03:24:31 2011 +0100
+++ b/acinclude.m4	Wed Oct 19 03:31:42 2011 +0100
@@ -772,6 +772,9 @@
   AC_MSG_RESULT(${ENABLE_CACAO})
   AM_CONDITIONAL(ENABLE_CACAO, test x"${ENABLE_CACAO}" = "xyes")
   AC_SUBST(ENABLE_CACAO)
+  if test "x${ENABLE_CACAO}" = "xyes" ; then
+    AC_MSG_ERROR([CACAO does not currently work with OpenJDK7; see http://server.complang.tuwien.ac.at/cgi-bin/bugzilla/show_bug.cgi?id=154])
+  fi
 ])
 
 AC_DEFUN([IT_WITH_CACAO_HOME],