changeset in /hg/icedtea6: 2009-08-07 Matthias Klose <doko at ubu...

[doko at ubuntu.com]

changeset 9420faca6468 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=9420faca6468
description:
	2009-08-07  Matthias Klose  <doko at ubuntu.com>

	        * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
	        for --with-*-src-zip= if not specified.

diffstat:

2 files changed, 8 insertions(+), 1 deletion(-)
ChangeLog   |    5 +++++
Makefile.am |    4 +++-

diffs (26 lines):

diff -r b775cb0d0900 -r 9420faca6468 ChangeLog
--- a/ChangeLog	Thu Aug 06 10:43:31 2009 -0400
+++ b/ChangeLog	Fri Aug 07 11:58:27 2009 +0200
@@ -1,3 +1,8 @@ 2009-08-06  Deepak Bhole  <dbhole at redhat
+2009-08-07  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
+	for --with-*-src-zip= if not specified.
+
 2009-08-06  Deepak Bhole  <dbhole at redhat.com>
 
 	* plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Handle error messages
diff -r b775cb0d0900 -r 9420faca6468 Makefile.am
--- a/Makefile.am	Thu Aug 06 10:43:31 2009 -0400
+++ b/Makefile.am	Fri Aug 07 11:58:27 2009 +0200
@@ -1841,7 +1841,9 @@ ADD_ZERO_CONFIGURE_ARGS += \
 			'--with-java=% '--with-javah=% \
 			'--with-rmic=% '--with-additional-vms=% \
 			'--with-openjdk '--with-openjdk=% , \
-		$(CONFIGURE_ARGS))
+		$(CONFIGURE_ARGS)) \
+	$(foreach i, openjdk hotspot, \
+	  $(if $(findstring --with-$(i)-src-zip=, $(CONFIGURE_ARGS)),, --with-$(i)-src-zip=$(abs_top_builddir)/$(i).tar.gz))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \