Mercurial > hg > release > icedtea6-1.7
changeset 1721:66ad418c7b91
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.
| author | Robert Schuster <robertschuster@fsfe.org> |
|---|---|
| date | Thu, 01 Oct 2009 11:24:55 +0200 |
| parents | b387a64caa08 |
| children | c7458f207acf 83619682858e |
| files | ChangeLog Makefile.am acinclude.m4 configure.ac |
| diffstat | 4 files changed, 42 insertions(+), 0 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Mon Sep 28 19:02:32 2009 +0100 +++ b/ChangeLog Thu Oct 01 11:24:55 2009 +0200 @@ -1,3 +1,9 @@ +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. + 2009-09-03 Andrew John Hughes <ahughes@redhat.com> PR icedtea/356
--- a/Makefile.am Mon Sep 28 19:02:32 2009 +0100 +++ b/Makefile.am Thu Oct 01 11:24:55 2009 +0200 @@ -348,8 +348,12 @@ if USE_ALT_CACAO_SRC_ZIP CACAO_SRC_ZIP = $(ALT_CACAO_SRC_ZIP) else +if USE_ALT_CACAO_SRC_DIR + CACAO_SRC_ZIP = "not needed" +else CACAO_SRC_ZIP = cacao-$(CACAO_VERSION).tar.gz endif +endif # VisualVM sources. Alternatives cannot be used here. NETBEANS_PROFILER_URL = http://icedtea.classpath.org/visualvm/ @@ -424,6 +428,8 @@ if !USE_SYSTEM_CACAO if USE_ALT_CACAO_SRC_ZIP else +if USE_ALT_CACAO_SRC_DIR +else if ! echo "$(CACAO_MD5SUM) $(CACAO_SRC_ZIP)" \ | $(MD5SUM) --check ; \ then \ @@ -436,6 +442,7 @@ endif endif endif +endif if WITH_VISUALVM if ! echo "$(NETBEANS_PROFILER_MD5SUM) $(NETBEANS_PROFILER_SRC_ZIP)" \ | $(MD5SUM) --check ; \ @@ -469,8 +476,11 @@ rm -f stamps/download.stamp rm -f $(OPENJDK_SRC_ZIP) if BUILD_CACAO +if USE_ALT_CACAO_SRC_DIR +else rm -f $(CACAO_SRC_ZIP) endif +endif if WITH_VISUALVM rm -f $(VISUALVM_SRC_ZIP) rm -f $(NETBEANS_PROFILER_SRC_ZIP) @@ -758,6 +768,13 @@ endif 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 if ! test -d cacao ; \ then \ mkdir cacao ; \ @@ -767,6 +784,7 @@ fi endif endif +endif if WITH_VISUALVM if ! test -d netbeans ; \ then \
--- a/acinclude.m4 Mon Sep 28 19:02:32 2009 +0100 +++ b/acinclude.m4 Thu Oct 01 11:24:55 2009 +0200 @@ -857,6 +857,23 @@ AC_SUBST(ALT_CACAO_SRC_ZIP) ]) +AC_DEFUN([AC_CHECK_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([AC_CHECK_WITH_GCJ], [ AC_MSG_CHECKING([whether to compile ecj natively])