changeset in /hg/icedtea6: 2008-07-14 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 2167417238fc in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=2167417238fc
description:
	2008-07-14  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (stamps/download.stamp): Disable checksum test and
	        download when configured --with-cacao-src-zip.

diffstat:

2 files changed, 8 insertions(+)
ChangeLog   |    5 +++++
Makefile.am |    3 +++

diffs (32 lines):

diff -r b380bccac6ca -r 2167417238fc ChangeLog
--- a/ChangeLog	Mon Jul 14 15:50:35 2008 +0200
+++ b/ChangeLog	Mon Jul 14 18:24:57 2008 +0200
@@ -1,3 +1,8 @@ 2008-07-14  Matthias Klose  <doko at ubuntu
+2008-07-14  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (stamps/download.stamp): Disable checksum test and
+	download when configured --with-cacao-src-zip.
+
 2008-07-14  Matthias Klose  <doko at ubuntu.com>
 
 	* acinclude.m4 (FIND_JAR): Check if $JAR supports @<file>;
diff -r b380bccac6ca -r 2167417238fc Makefile.am
--- a/Makefile.am	Mon Jul 14 15:50:35 2008 +0200
+++ b/Makefile.am	Mon Jul 14 18:24:57 2008 +0200
@@ -278,6 +278,8 @@ endif
 endif
 if WITH_CACAO
 if !USE_SYSTEM_CACAO
+if USE_ALT_CACAO_SRC_ZIP
+else
 	if ! echo "$(CACAO_MD5SUM)  $(CACAO_SRC_ZIP)" \
 	 | $(MD5SUM) --check ; \
 	then \
@@ -287,6 +289,7 @@ if !USE_SYSTEM_CACAO
 	 fi ; \
 	 $(WGET) $(CACAO_URL)$(CACAO_SRC_ZIP) -O $(CACAO_SRC_ZIP); \
 	fi
+endif
 endif
 endif
 	mkdir -p stamps