Mercurial > hg > release > icedtea7-2.0
changeset 2395:bc3f282f0bc5
Add --with-jamvm-src-zip support.
2011-02-23 Xerxes Ranby <xerxes@zafena.se>
JamVM: configure --with-jamvm-src-zip
* NEWS: Updated.
* Makefile.am (stamps/download-jamvm.stamp):
Link in jamvm source zip dependent on USE_ALT_JAMVM_SRC_ZIP
* acinclude.m4 (IT_CHECK_WITH_JAMVM_SRC_ZIP): New macro.
(USE_ALT_JAMVM_SRC_ZIP): New conditional.
(ALT_JAMVM_SRC_ZIP): New variable.
* configure.ac: Call IT_CHECK_WITH_JAMVM_SRC_ZIP.
| author | Xerxes R?nby <xerxes@zafena.se> |
|---|---|
| date | Thu, 19 May 2011 23:28:51 +0100 |
| parents | d327a9da4588 |
| children | 526e140c51c9 |
| files | ChangeLog Makefile.am NEWS acinclude.m4 configure.ac |
| diffstat | 5 files changed, 33 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Feb 23 16:54:17 2011 +0100 +++ b/ChangeLog Thu May 19 23:28:51 2011 +0100 @@ -1,3 +1,14 @@ +2011-02-23 Xerxes Ranby <xerxes@zafena.se> + + JamVM: configure --with-jamvm-src-zip + * NEWS: Updated. + * Makefile.am (stamps/download-jamvm.stamp): + Link in jamvm source zip dependent on USE_ALT_JAMVM_SRC_ZIP + * acinclude.m4 (IT_CHECK_WITH_JAMVM_SRC_ZIP): New macro. + (USE_ALT_JAMVM_SRC_ZIP): New conditional. + (ALT_JAMVM_SRC_ZIP): New variable. + * configure.ac: Call IT_CHECK_WITH_JAMVM_SRC_ZIP. + 2011-02-23 Xerxes Ranby <xerxes@zafena.se> * Makefile.am: (JAMVM_BASE_URL): Switch to using IcedTea
--- a/Makefile.am Wed Feb 23 16:54:17 2011 +0100 +++ b/Makefile.am Thu May 19 23:28:51 2011 +0100 @@ -1094,6 +1094,9 @@ stamps/download-jamvm.stamp: if BUILD_JAMVM +if USE_ALT_JAMVM_SRC_ZIP + ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP) +endif if ! echo "$(JAMVM_SHA256SUM) $(JAMVM_SRC_ZIP)" \ | $(SHA256SUM) --check ; \ then \
--- a/NEWS Wed Feb 23 16:54:17 2011 +0100 +++ b/NEWS Thu May 19 23:28:51 2011 +0100 @@ -4,6 +4,7 @@ release cycle. * Added out-of-the-box JamVM support using --enable-jamvm * Allow building of JamVM beside the default VM by using --with-additional-vms=jamvm +* Allow the location of the JamVM source zip to be specified using --with-jamvm-src-zip * Bug fixes - PR616, PR99: Don't statically link libstdc++ * Zero/Shark
--- a/acinclude.m4 Wed Feb 23 16:54:17 2011 +0100 +++ b/acinclude.m4 Thu May 19 23:28:51 2011 +0100 @@ -1905,3 +1905,20 @@ AM_CONDITIONAL(ENABLE_JAMVM, test x"${ENABLE_JAMVM}" = "xyes") AC_SUBST(ENABLE_JAMVM) ]) + +AC_DEFUN([IT_CHECK_WITH_JAMVM_SRC_ZIP], +[ + AC_MSG_CHECKING([for a JamVM source zip]) + AC_ARG_WITH([jamvm-src-zip], + [AS_HELP_STRING(--with-jamvm-src-zip,specify the location of the JamVM source zip)], + [ + ALT_JAMVM_SRC_ZIP=${withval} + AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x = x) + ], + [ + ALT_JAMVM_SRC_ZIP="not specified" + AM_CONDITIONAL(USE_ALT_JAMVM_SRC_ZIP, test x != x) + ]) + AC_MSG_RESULT(${ALT_JAMVM_SRC_ZIP}) + AC_SUBST(ALT_JAMVM_SRC_ZIP) +])