changeset in /hg/icedtea6: Makefile.am (ADD_ZERO_CONFIGURE_ARGS)...

[doko at ubuntu.com]

changeset a5464a5c3e45 in /hg/icedtea6
details: http://icedtea.classpath.org/hg/icedtea6?cmd=changeset;node=a5464a5c3e45
description:
	Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Use --with-openjdk only

diffstat:

2 files changed, 6 insertions(+), 4 deletions(-)
ChangeLog   |    4 ++++
Makefile.am |    6 ++----

diffs (34 lines):

diff -r abb60b806ed6 -r a5464a5c3e45 ChangeLog
--- 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  Lillian Angel  <langel at redha
+2009-06-12  Matthias Klose  <doko at ubuntu.com>
+
+	* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Use --with-openjdk only.
+
 2009-06-12  Lillian Angel  <langel at redhat.com>
 
 	* acinclude.m4:
diff -r abb60b806ed6 -r a5464a5c3e45 Makefile.am
--- 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 @@ endif
 # 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 @@ ADD_ZERO_CONFIGURE_ARGS += \
 	$(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 = \