/hg/icedtea6: 2009-10-01 Robert Schuster <robertschuster at fsfe....

[rschuster at icedtea.classpath.org]

changeset 66ad418c7b91 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=66ad418c7b91
author: Robert Schuster <robertschuster at fsfe.org>
date: Thu Oct 01 11:24:55 2009 +0200

	2009-10-01 Robert Schuster <robertschuster at 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.


diffstat:

4 files changed, 42 insertions(+)
ChangeLog    |    6 ++++++
Makefile.am  |   18 ++++++++++++++++++
acinclude.m4 |   17 +++++++++++++++++
configure.ac |    1 +

diffs (116 lines):

diff -r b387a64caa08 -r 66ad418c7b91 ChangeLog
--- 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-09-03  Andrew John Hughes  <ahughes
+2009-10-01  Robert Schuster  <robertschuster at 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 at redhat.com>
 
 	PR icedtea/356
diff -r b387a64caa08 -r 66ad418c7b91 Makefile.am
--- a/Makefile.am	Mon Sep 28 19:02:32 2009 +0100
+++ b/Makefile.am	Thu Oct 01 11:24:55 2009 +0200
@@ -348,7 +348,11 @@ if USE_ALT_CACAO_SRC_ZIP
 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.
@@ -424,6 +428,8 @@ if !USE_SYSTEM_CACAO
 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 \
@@ -433,6 +439,7 @@ else
 	 fi ; \
 	 $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
 	fi
+endif
 endif
 endif
 endif
@@ -469,7 +476,10 @@ clean-download:
 	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)
@@ -758,6 +768,13 @@ endif
 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 ; \
@@ -765,6 +782,7 @@ if !USE_SYSTEM_CACAO
 	  dir=$$(basename cacao/cacao-*) ; \
 	  ln -s $$dir cacao/cacao ; \
 	fi
+endif
 endif
 endif
 if WITH_VISUALVM
diff -r b387a64caa08 -r 66ad418c7b91 acinclude.m4
--- 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_DEFUN([AC_CHECK_WITH_CACAO_SRC_ZIP],
   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])
diff -r b387a64caa08 -r 66ad418c7b91 configure.ac
--- a/configure.ac	Mon Sep 28 19:02:32 2009 +0100
+++ b/configure.ac	Thu Oct 01 11:24:55 2009 +0200
@@ -243,6 +243,7 @@ AC_CHECK_ENABLE_CACAO
 AC_CHECK_ENABLE_CACAO
 AC_CHECK_WITH_CACAO_HOME
 AC_CHECK_WITH_CACAO_SRC_ZIP
+AC_CHECK_WITH_CACAO_SRC_DIR
 ENABLE_OPTIMIZATIONS
 ENABLE_ZERO_BUILD
 SET_CORE_OR_SHARK_BUILD