Mercurial > hg > icedtea6
changeset 3234:285f0a597b47
Merge
| author | Andrew John Hughes <gnu.andrew@redhat.com> |
|---|---|
| date | Tue, 03 May 2016 20:00:25 +0100 |
| parents | 9e1c6190ff58 (current diff) e9935e163815 (diff) |
| children | 75a7c4a1290d |
| files | ChangeLog |
| diffstat | 3 files changed, 11 insertions(+), 1 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Fri Jan 29 21:40:32 2016 +0000 +++ b/ChangeLog Tue May 03 20:00:25 2016 +0100 @@ -1,3 +1,10 @@ +2016-02-15 Andrew John Hughes <gnu.andrew@redhat.com> + + PR2849: wget not required when downloading is disabled + * NEWS: Updated. + * configure.ac: + Only check for wget if downloading is enabled. + 2016-01-29 Andrew John Hughes <gnu.andrew@redhat.com> * Makefile.am:
--- a/NEWS Fri Jan 29 21:40:32 2016 +0000 +++ b/NEWS Tue May 03 20:00:25 2016 +0100 @@ -26,6 +26,7 @@ * Bug fixes - PR1886: IcedTea does not checksum supplied tarballs - PR2083: Add support for building Zero on AArch64 + - PR2849: wget not required when downloading is disabled New in release 1.13.10 (2016-01-22):
--- a/configure.ac Fri Jan 29 21:40:32 2016 +0000 +++ b/configure.ac Tue May 03 20:00:25 2016 +0100 @@ -33,7 +33,6 @@ IT_FIND_TOOL([TAR], [tar]) IT_FIND_TOOL([CHMOD], [chmod]) IT_FIND_TOOL([SHA256SUM], [sha256sum]) -IT_FIND_TOOL([WGET], [wget]) IT_FIND_TOOL([ZIP], [zip]) IT_FIND_TOOL([UNZIP], [unzip]) IT_FIND_TOOL([CPIO], [cpio]) @@ -268,6 +267,9 @@ IT_FIND_ECJ_JAR IT_FIND_TOOL([XSLTPROC], [xsltproc]) fi +if test "x$enable_downloading" = "xyes"; then + IT_FIND_TOOL([WGET], [wget]) +fi IT_USING_CACAO AC_CONFIG_FILES([javac], [chmod +x javac]) AC_CONFIG_FILES([javap], [chmod +x javap])