changeset in /hg/icedtea6: Support building using --with-openjdk...

[Andrew John Hughes]

changeset 7b1c3278c88a in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=7b1c3278c88a
description:
	Support building using --with-openjdk-src-dir.

	2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>

		* Makefile.am:
		Properly support --with-openjdk-src-dir.
		* acinclude.m4:
		Correct the define for OPENJDK_SRC_DIR.

diffstat:

3 files changed, 18 insertions(+), 1 deletion(-)
ChangeLog    |    7 +++++++
Makefile.am  |   10 ++++++++++
acinclude.m4 |    2 +-

diffs (78 lines):

diff -r 7e85e3fd25d7 -r 7b1c3278c88a ChangeLog
--- a/ChangeLog	Tue Dec 09 21:42:14 2008 +0000
+++ b/ChangeLog	Tue Dec 09 22:30:54 2008 +0000
@@ -1,3 +1,10 @@ 2008-12-09  Andrew John Hughes  <gnu_and
+2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
+
+	* Makefile.am:
+	Properly support --with-openjdk-src-dir.
+	* acinclude.m4:
+	Correct the define for OPENJDK_SRC_DIR.
+
 2008-12-09  Andrew John Hughes  <gnu_andrew at member.fsf.org>
 
 	* Makefile.am:
diff -r 7e85e3fd25d7 -r 7b1c3278c88a Makefile.am
--- a/Makefile.am	Tue Dec 09 21:42:14 2008 +0000
+++ b/Makefile.am	Tue Dec 09 22:30:54 2008 +0000
@@ -342,6 +342,8 @@ endif
 endif
 
 stamps/hgforest.stamp:
+if OPENJDK_SRC_DIR_FOUND
+else
 if USE_ALT_OPENJDK_SRC_ZIP
 else
 if !USE_HG
@@ -354,10 +356,13 @@ else
           fi;
 endif
 endif
+endif
 	mkdir -p stamps 
 	touch stamps/hgforest.stamp
 
 stamps/download.stamp: stamps/hgforest.stamp
+if OPENJDK_SRC_DIR_FOUND
+else
 if USE_ALT_OPENJDK_SRC_ZIP
 else
 if USE_HG
@@ -379,6 +384,7 @@ else
 else
 	changeset="`cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2`"; \
 	$(WGET) $(HOTSPOT_URL)$${changeset}.tar.gz -O $(HOTSPOT_SRC_ZIP);
+endif
 endif
 endif
 if WITH_CACAO
@@ -668,6 +674,9 @@ ICEDTEA_PATCHES += \
 	$(DISTRIBUTION_PATCHES)
 
 stamps/extract.stamp: stamps/download.stamp
+if OPENJDK_SRC_DIR_FOUND
+	cp -a $(OPENJDK_SRC_DIR) openjdk
+else
 	if ! test -d openjdk ; \
 	then \
 	  mkdir openjdk ; \
@@ -683,6 +692,7 @@ if WITH_ALT_HSBUILD
 	  chmod -R ug+w hotspot-* ; \
 	  mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \
 	fi
+endif
 endif
 if WITH_CACAO
 if !USE_SYSTEM_CACAO
diff -r 7e85e3fd25d7 -r 7b1c3278c88a acinclude.m4
--- a/acinclude.m4	Tue Dec 09 21:42:14 2008 +0000
+++ b/acinclude.m4	Tue Dec 09 22:30:54 2008 +0000
@@ -198,7 +198,7 @@ AC_DEFUN([WITH_OPENJDK_SRC_DIR],
     AC_MSG_RESULT(${OPENJDK_SRC_DIR})
   ])
   AC_SUBST(OPENJDK_SRC_DIR)
-  AM_CONDITIONAL(GNU_CLASSLIB_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue)
+  AM_CONDITIONAL(OPENJDK_SRC_DIR_FOUND, test "x${conditional_with_openjdk_sources}" = xtrue)
 ])
 
 AC_DEFUN([FIND_ECJ_JAR],