# HG changeset patch
# User Andrew John Hughes <ahughes@redhat.com>
# Date 1279297339 -3600
# Node ID 64567ce4112b6934f0fdb3cc894ef6c337361505
# Parent  c3605faebe9260cdca309a3b8a2da70e53d831f1
Fix issues found when building on Gentoo/ppc64 with 32-bit userland and --enable-cacao.

2010-07-16  Andrew John Hughes  <ahughes@redhat.com>

	* acinclude.m4:
	(IT_SET_ARCH_DIRS): Check for LINUX32 here
	as this is the macro that needs it.
	(FIND_ECJ_JAR): Check for /usr/share/eclipse-ecj/ecj.jar,
	as this is used by the bootstrap ecj-gcj package on Gentoo.
	(ENABLE_ZERO_BUILD): Add requirement on CACAO check.
	(IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO,
	as this is not an autoconf macro but an IcedTea one.
	* configure.ac:
	Remove search for LINUX32 (moved to IT_SET_ARCH_DIRS).
	Fix name of CACAO macro (see above).

diff -r c3605faebe92 -r 64567ce4112b ChangeLog
--- a/ChangeLog	Wed Jun 02 16:59:01 2010 +0100
+++ b/ChangeLog	Fri Jul 16 17:22:19 2010 +0100
@@ -1,3 +1,17 @@
+2010-07-16  Andrew John Hughes  <ahughes@redhat.com>
+
+	* acinclude.m4:
+	(IT_SET_ARCH_DIRS): Check for LINUX32 here
+	as this is the macro that needs it.
+	(FIND_ECJ_JAR): Check for /usr/share/eclipse-ecj/ecj.jar,
+	as this is used by the bootstrap ecj-gcj package on Gentoo.
+	(ENABLE_ZERO_BUILD): Add requirement on CACAO check.
+	(IT_CHECK_ENABLE_CACAO): Renamed from AC_CHECK_ENABLE_CACAO,
+	as this is not an autoconf macro but an IcedTea one.
+	* configure.ac:
+	Remove search for LINUX32 (moved to IT_SET_ARCH_DIRS).
+	Fix name of CACAO macro (see above).
+
 2009-12-22  Andrew John Hughes  <ahughes@redhat.com>
 
 	Backport --with-tzdata-dir option from IcedTea6.
diff -r c3605faebe92 -r 64567ce4112b acinclude.m4
--- a/acinclude.m4	Wed Jun 02 16:59:01 2010 +0100
+++ b/acinclude.m4	Fri Jul 16 17:22:19 2010 +0100
@@ -1,5 +1,6 @@
 AC_DEFUN_ONCE([IT_SET_ARCH_DIRS],
 [
+  AC_PATH_TOOL([LINUX32],[linux32])
   case "${host}" in
     x86_64-*-*)
       BUILD_ARCH_DIR=amd64
@@ -258,6 +259,9 @@
     elif test -e "/usr/share/java/ecj.jar"; then
       ECJ_JAR=/usr/share/java/ecj.jar
       AC_MSG_RESULT(${ECJ_JAR})
+    elif test -e "/usr/share/eclipse-ecj/ecj.jar"; then
+      ECJ_JAR=/usr/share/eclipse-ecj/ecj.jar
+      AC_MSG_RESULT(${ECJ_JAR})
     elif test -e "/usr/share/eclipse-ecj-3.3/lib/ecj.jar"; then
       ECJ_JAR=/usr/share/eclipse-ecj-3.3/lib/ecj.jar
       AC_MSG_RESULT(${ECJ_JAR})
@@ -680,6 +684,7 @@
 [
   AC_REQUIRE([SET_SHARK_BUILD])
   AC_REQUIRE([IT_SET_ARCH_DIRS])
+  AC_REQUIRE([IT_CHECK_ENABLE_CACAO])
   AC_MSG_CHECKING(whether to use the zero-assembler port)
   use_zero=no
   AC_ARG_ENABLE([zero],
@@ -798,7 +803,7 @@
   AM_CONDITIONAL(SHARK_BUILD, test "x${use_shark}" = xyes)
 ])
 
-AC_DEFUN([AC_CHECK_ENABLE_CACAO],
+AC_DEFUN([IT_CHECK_ENABLE_CACAO],
 [
   AC_MSG_CHECKING(whether to use CACAO as VM)
   AC_ARG_ENABLE([cacao],
diff -r c3605faebe92 -r 64567ce4112b configure.ac
--- a/configure.ac	Wed Jun 02 16:59:01 2010 +0100
+++ b/configure.ac	Fri Jul 16 17:22:19 2010 +0100
@@ -44,7 +44,6 @@
 AC_PATH_TOOL([LSB_RELEASE],[lsb_release])
 AC_CHECK_WITH_GCJ
 AC_CHECK_WITH_HOTSPOT_BUILD
-AC_PATH_TOOL([LINUX32],[linux32])
 AC_CHECK_GCC_VERSION
 AC_CHECK_FOR_OPENJDK
 
@@ -240,7 +239,7 @@
 WITH_HOTSPOT_SRC_ZIP
 WITH_OPENJDK_SRC_DIR
 WITH_ALT_JAR_BINARY
-AC_CHECK_ENABLE_CACAO
+IT_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
 ENABLE_OPTIMIZATIONS