Mercurial > hg > release > icedtea6-1.5
changeset 1270:7b1c3278c88a
Support building using --with-openjdk-src-dir.
2008-12-09 Andrew John Hughes <gnu_andrew@member.fsf.org>
* Makefile.am:
Properly support --with-openjdk-src-dir.
* acinclude.m4:
Correct the define for OPENJDK_SRC_DIR.
| author | Andrew John Hughes <gnu_andrew@member.fsf.org> |
|---|---|
| date | Tue, 09 Dec 2008 22:30:54 +0000 |
| parents | 7e85e3fd25d7 |
| children | 569f19d48956 |
| files | ChangeLog Makefile.am acinclude.m4 |
| diffstat | 3 files changed, 18 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- 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_andrew@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@member.fsf.org> * 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 stamps/hgforest.stamp: +if OPENJDK_SRC_DIR_FOUND +else if USE_ALT_OPENJDK_SRC_ZIP else if !USE_HG @@ -354,10 +356,13 @@ 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 @@ -381,6 +386,7 @@ $(WGET) $(HOTSPOT_URL)$${changeset}.tar.gz -O $(HOTSPOT_SRC_ZIP); endif endif +endif if WITH_CACAO if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP @@ -668,6 +674,9 @@ $(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 ; \ @@ -684,6 +693,7 @@ mv hotspot-$$(cat $(abs_top_srcdir)/hotspot.map|grep $(HSBUILD)|cut -f2) openjdk/hotspot ; \ fi endif +endif if WITH_CACAO if !USE_SYSTEM_CACAO if ! test -d cacao ; \
--- 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_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],