/hg/icedtea6: Additional vm builds: Only pass --with-hotspot-src...

[doko at icedtea.classpath.org]

changeset 546bafa175f1 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=546bafa175f1
author: doko at ubuntu.com
date: Fri Feb 19 20:25:47 2010 +0100

	Additional vm builds: Only pass --with-hotspot-src-zip if configured
	for alternate hotspot

	2010-02-19 Matthias Klose <doko at ubuntu.com>

	 * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
	        --with-hotspot-src-zip if configured for alternate hotspot.


diffstat:

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

diffs (29 lines):

diff -r a6ee397f4b59 -r 546bafa175f1 ChangeLog
--- a/ChangeLog	Fri Feb 19 15:34:31 2010 +0000
+++ b/ChangeLog	Fri Feb 19 20:25:47 2010 +0100
@@ -1,3 +1,8 @@ 2010-02-19 Andrew John Hughes  <ahughes@
+2010-02-19  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Only pass
+	--with-hotspot-src-zip if configured for alternate hotspot.
+
 2010-02-19 Andrew John Hughes  <ahughes at redhat.com>
 
 	* patches/icedtea-cacao-ignore-jdi-tests.patch:
diff -r a6ee397f4b59 -r 546bafa175f1 Makefile.am
--- a/Makefile.am	Fri Feb 19 15:34:31 2010 +0000
+++ b/Makefile.am	Fri Feb 19 20:25:47 2010 +0100
@@ -1943,9 +1943,12 @@ ADD_ZERO_CONFIGURE_ARGS += \
 			'--with-openjdk '--with-openjdk=% , \
 		$(CONFIGURE_ARGS)) \
 	$(if $(findstring --with-openjdk-src-zip=, $(CONFIGURE_ARGS)),, \
-	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP)) \
+	  --with-openjdk-src-zip=$(abs_top_builddir)/$(OPENJDK_SRC_ZIP))
+if WITH_ALT_HSBUILD
+ADD_ZERO_CONFIGURE_ARGS += \
 	$(if $(findstring --with-hotspot-src-zip=, $(CONFIGURE_ARGS)),, \
 	  --with-hotspot-src-zip=$(abs_top_builddir)/$(HOTSPOT_SRC_ZIP))
+endif
 
 ADD_ZERO_EXTRA_BUILD_ENV = \
 	BUILD_LANGTOOLS=false ALT_LANGTOOLS_DIST=$(ICEDTEA_BUILD_DIR)/langtools/dist \