Mercurial > hg > release > icedtea7-2.6

changeset 1975:39d2012855a5

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
2009-08-06 Matthias Klose <doko@ubuntu.com> * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Adjust for added/removed configuration options.
author doko@ubuntu.com
date Thu, 06 Aug 2009 18:35:39 +0200
parents da8d53a6fafd
children 209e9a326eb9
files ChangeLog Makefile.am
diffstat 2 files changed, 9 insertions(+), 6 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Thu Aug 06 17:28:47 2009 +0100
+++ b/ChangeLog	Thu Aug 06 18:35:39 2009 +0200
@@ -1,3 +1,8 @@
+2009-08-06  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Adjust for added/removed
+	configuration options.
+
 2009-08-06  Andrew John Hughes  <ahughes@redhat.com>
 
 	* Makefile.am:
--- a/Makefile.am	Thu Aug 06 17:28:47 2009 +0100
+++ b/Makefile.am	Thu Aug 06 18:35:39 2009 +0200
@@ -3423,20 +3423,18 @@
 # configure script arguments, quoted in single quotes
 CONFIGURE_ARGS = @CONFIGURE_ARGS@
 ADD_ZERO_CONFIGURE_ARGS = \
-	--with-openjdk \
-	--with-openjdk-home=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
-	--enable-zero
+	--with-jdk-home=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
+	--disable-bootstrap --enable-zero
 if ADD_SHARK_BUILD
 ADD_ZERO_CONFIGURE_ARGS += \
 	--enable-shark
 endif
 ADD_ZERO_CONFIGURE_ARGS += \
 	--disable-docs \
-	$(filter-out '--with-gcj-home=% '--with-ecj=% \
+	$(filter-out '--with-jdk-home=% '--with-ecj=% \
 			'--with-java=% '--with-javah=% \
 			'--with-rmic=% '--with-additional-vms=% \
-			'--with-icedtea '--with-icedtea-home=% \
-			'--with-openjdk '--with-openjdk-home=% , \
+			'--disable-bootstrap% '--enable-bootstrap% , \
 		$(CONFIGURE_ARGS))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \