--- a/ChangeLog	Fri Sep 30 04:33:46 2011 +0100
+++ b/ChangeLog	Tue May 05 05:07:32 2015 +0100
@@ -1,3 +1,36 @@
+2013-06-07  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1277: Synchronise CACAO rules between IcedTea6/7/8
+	where possible
+	* NEWS: Updated.
+
+2011-02-23  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_WITH_CACAO_SRC_DIR): Renamed from
+	IT_CHECK_WITH_CACAO_SRC_DIR.
+	* configure.ac: Synchronise naming.
+
+2011-02-21  Andrew John Hughes  <ahughes@redhat.com>
+
+	Ensure all our macros have an IT_ prefix.
+	* acinclude.m4:
+	(IT_CHECK_WITH_CACAO_SRC_DIR): Renamed from
+	AC_CHECK_WITH_CACAO_SRC_DIR.
+	* configure.ac: Synchronise naming.
+
+2010-01-16 Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(AC_CHECK_WITH_CACAO_SRC_DIR): Quote checking
+	output.
+
+2009-10-01  Robert Schuster  <robertschuster@fsfe.org>
+
+	* configure.ac: Added --with-cacao-src-dir option.
+	* acinclude: New macro AC_CHECK_WITH_CACAO_SRC_DIR.
+	* Makefile.am: Copy Cacao sources when USE_ALT_CACAO_SRC_DIR is used.
+
 2010-11-11  Stefan Ring  <stefan@complang.tuwien.ac.at>
 
 	* Makefile.am: Upgrade CACAO version,

--- a/Makefile.am	Fri Sep 30 04:33:46 2011 +0100
+++ b/Makefile.am	Tue May 05 05:07:32 2015 +0100
@@ -744,6 +744,8 @@
 stamps/download-cacao.stamp:
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_DIR
+else
 if USE_ALT_CACAO_SRC_ZIP
 	ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
 endif
@@ -765,6 +767,7 @@
 	fi
 endif
 endif
+endif
 	mkdir -p stamps
 	touch $@
 
@@ -1049,6 +1052,13 @@
 stamps/extract-cacao.stamp: stamps/download-cacao.stamp
 if BUILD_CACAO
 if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_DIR
+	if ! test -d cacao ; \
+	then \
+	  mkdir -p cacao/cacao ; \
+	  cp -r $(ALT_CACAO_SRC_DIR)/* cacao/cacao/ ; \
+	fi
+else
 	set -e ; \
 	if ! test -d cacao/cacao ; \
 	then \
@@ -1061,6 +1071,7 @@
 	fi
 endif
 endif
+endif
 	mkdir -p stamps
 	touch $@
 

--- a/NEWS	Fri Sep 30 04:33:46 2011 +0100
+++ b/NEWS	Tue May 05 05:07:32 2015 +0100
@@ -25,6 +25,7 @@
   - S8041658: Use of -fdevirtualize on macroAssembler_x86.o (via -O2) with gcc 4.9.0 creates broken VM
   - PR729: GTKLookAndFeel should be the system look&feel on all GNU/Linux desktops
   - PR1275: Provide option to turn off downloading of tarballs
+  - PR1277: Synchronise CACAO rules between IcedTea6/7/8 where possible
   - PR1279: Synchronise CACAO versions between IcedTea6/7/8 where possible
   - PR1281, RH513605: Updating/Installing OpenJDK should recreate the shared class-data archive
   - PR1289: Allow JARs to be optionally compressed by setting COMPRESS_JARS

--- a/acinclude.m4	Fri Sep 30 04:33:46 2011 +0100
+++ b/acinclude.m4	Tue May 05 05:07:32 2015 +0100
@@ -820,6 +820,23 @@
   AC_SUBST(ALT_CACAO_SRC_ZIP)
 ])
 
+AC_DEFUN([IT_WITH_CACAO_SRC_DIR],
+[
+  AC_MSG_CHECKING([for a CACAO source directory])
+  AC_ARG_WITH([cacao-src-dir],
+              [AS_HELP_STRING(--with-cacao-src-dir,specify the location of the Cacao sources)],
+  [
+    ALT_CACAO_SRC_DIR=${withval}
+    AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x = x)
+  ],
+  [
+    ALT_CACAO_SRC_DIR="not specified"
+    AM_CONDITIONAL(USE_ALT_CACAO_SRC_DIR, test x != x)
+  ])
+  AC_MSG_RESULT(${ALT_CACAO_SRC_DIR})
+  AC_SUBST(ALT_CACAO_SRC_DIR)
+])
+
 AC_DEFUN([IT_ENABLE_HG],
 [
   AC_MSG_CHECKING(whether to retrieve the source code from Mercurial)

--- a/configure.ac	Fri Sep 30 04:33:46 2011 +0100
+++ b/configure.ac	Tue May 05 05:07:32 2015 +0100
@@ -133,6 +133,7 @@
 IT_ENABLE_CACAO
 IT_WITH_CACAO_HOME
 IT_WITH_CACAO_SRC_ZIP
+IT_WITH_CACAO_SRC_DIR
 IT_ENABLE_JAMVM
 IT_WITH_JAMVM_SRC_ZIP