Mercurial > hg > release > icedtea6-1.6
changeset 1657:9420faca6468
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:58:27 +0200 |
parents | b775cb0d0900 |
children | 1543ef3c5ed5 |
files | ChangeLog Makefile.am |
diffstat | 2 files changed, 8 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Thu Aug 06 10:43:31 2009 -0400 +++ b/ChangeLog Fri Aug 07 11:58:27 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 Deepak Bhole <dbhole@redhat.com> * plugin/icedteanp/IcedTeaJavaRequestProcessor.cc: Handle error messages
--- a/Makefile.am Thu Aug 06 10:43:31 2009 -0400 +++ b/Makefile.am Fri Aug 07 11:58:27 2009 +0200 @@ -1841,7 +1841,9 @@ '--with-java=% '--with-javah=% \ '--with-rmic=% '--with-additional-vms=% \ '--with-openjdk '--with-openjdk=% , \ - $(CONFIGURE_ARGS)) + $(CONFIGURE_ARGS)) \ + $(foreach i, openjdk hotspot, \ + $(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 \