Mercurial > hg > release > icedtea6-1.6

changeset 1599:a5464a5c3e45

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Use --with-openjdk only
author doko@ubuntu.com
date Fri, 12 Jun 2009 19:20:11 +0200
parents abb60b806ed6
children b88686f19b34
files ChangeLog Makefile.am
diffstat 2 files changed, 6 insertions(+), 4 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 12 11:53:38 2009 -0400
+++ b/ChangeLog	Fri Jun 12 19:20:11 2009 +0200
@@ -1,3 +1,7 @@
+2009-06-12  Matthias Klose  <doko@ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Use --with-openjdk only.
+
 2009-06-12  Lillian Angel  <langel@redhat.com>
 
 	* acinclude.m4:
--- a/Makefile.am	Fri Jun 12 11:53:38 2009 -0400
+++ b/Makefile.am	Fri Jun 12 19:20:11 2009 +0200
@@ -1788,8 +1788,7 @@
 # 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 \
+	--with-openjdk=$(abs_top_builddir)/$(BUILD_OUTPUT_DIR)/j2sdk-image \
 	--enable-zero
 if ADD_SHARK_BUILD
 ADD_ZERO_CONFIGURE_ARGS += \
@@ -1800,8 +1799,7 @@
 	$(filter-out '--with-gcj-home=% '--with-ecj=% \
 			'--with-java=% '--with-javah=% \
 			'--with-rmic=% '--with-additional-vms=% \
-			'--with-icedtea '--with-icedtea-home=% \
-			'--with-openjdk '--with-openjdk-home=% , \
+			'--with-openjdk '--with-openjdk=% , \
 		$(CONFIGURE_ARGS))
 
 ADD_ZERO_EXTRA_BUILD_ENV = \