Mercurial > hg > release > icedtea7-2.6
changeset 1976:209e9a326eb9
2009-08-07 Matthias Klose <doko@ubuntu.com>
* Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options
for --with-*-src-zip= if not specified.
author | doko@ubuntu.com |
---|---|
date | Fri, 07 Aug 2009 11:53:17 +0200 |
parents | 39d2012855a5 |
children | 52ca492dae93 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 06 18:35:39 2009 +0200 +++ b/ChangeLog Fri Aug 07 11:53:17 2009 +0200 @@ -1,3 +1,8 @@ +2009-08-07 Matthias Klose <doko@ubuntu.com> + + * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Add configure options + for --with-*-src-zip= if not specified. + 2009-08-06 Matthias Klose <doko@ubuntu.com> * Makefile.am (ADD_ZERO_CONFIGURE_ARGS): Adjust for added/removed
--- a/Makefile.am Thu Aug 06 18:35:39 2009 +0200 +++ b/Makefile.am Fri Aug 07 11:53:17 2009 +0200 @@ -3435,7 +3435,9 @@ '--with-java=% '--with-javah=% \ '--with-rmic=% '--with-additional-vms=% \ '--disable-bootstrap% '--enable-bootstrap% , \ - $(CONFIGURE_ARGS)) + $(CONFIGURE_ARGS)) \ + $(foreach i, openjdk hotspot corba jaxp jaxws jdk langtools, \ + $(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 \