--- a/ChangeLog	Wed Jul 15 14:34:19 2015 +0100
+++ b/ChangeLog	Wed Jul 15 23:36:38 2015 +0100
@@ -1,3 +1,74 @@
+2015-07-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR1888: Allow tarball checksumming to be disabled
+	* INSTALL: Document new options.
+	* Makefile.am:
+	(OPENJDK_SHA256SUM_BIN): Define to either
+	$(SHA256SUM) or true, depending on whether or
+	not checksumming should be performed.
+	(CORBA_SHA256SUM_BIN): Likewise.
+	(JAXP_SHA256SUM_BIN): Likewise.
+	(JAXWS_SHA256SUM_BIN): Likewise.
+	(JDK_SHA256SUM_BIN): Likewise.
+	(LANGTOOLS_SHA256SUM_BIN): Likewise.
+	(CACAO_SHA256SUM_BIN): Likewise.
+	(JAMVM_SHA256SUM_BIN): Likewise.
+	(HOTSPOT_SHA256SUM_BIN): Likewise.
+	(download-openjdk): Use OPENJDK_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-corba): Use CORBA_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-jaxp): Use JAXP_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-jaxws): Use JAXWS_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-jdk): Use JDK_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-langtools): Use LANGTOOLS_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-cacao): Use CACAO_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-jamvm): Use JAMVM_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	(download-hotspot): Use HOTSPOT_SHA256SUM_BIN
+	instead of SHA256SUM directly.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_WITH_OPENJDK_SRC_ZIP): Define only once.
+	(IT_WITH_CACAO_SRC_ZIP): Likewise.
+	(IT_WITH_HOTSPOT_SRC_ZIP): Likewise.
+	(IT_WITH_CORBA_SRC_ZIP): Likewise.
+	(IT_WITH_JAXP_SRC_ZIP): Likewise.
+	(IT_WITH_JAXWS_SRC_ZIP): Likewise.
+	(IT_WITH_JDK_SRC_ZIP): Likewise.
+	(IT_WITH_LANGTOOLS_SRC_ZIP): Likewise.
+	(IT_WITH_JAMVM_SRC_ZIP): Likewise.
+	(IT_ENABLE_NON_NSS_CURVES): Check ${enableval}
+	to catch values other than yes/no.
+	(IT_ENABLE_OPENJDK_CHECKSUM): Provide
+	--disable-openjdk-checksum option.
+	(IT_ENABLE_CORBA_CHECKSUM): Provide
+	--disable-corba-checksum option.
+	(IT_ENABLE_JAXP_CHECKSUM): Provide
+	--disable-jaxp-checksum option.
+	(IT_ENABLE_JAXWS_CHECKSUM): Provide
+	--disable-jaxws-checksum option.
+	(IT_ENABLE_JDK_CHECKSUM): Provide
+	--disable-jdk-checksum option.
+	(IT_ENABLE_LANGTOOLS_CHECKSUM): Provide
+	--disable-langtools-checksum option.
+	(IT_ENABLE_CACAO_CHECKSUM): Provide
+	--disable-cacao-checksum option.
+	(IT_ENABLE_JAMVM_CHECKSUM): Provide
+	--disable-jamvm-checksum option.
+	(IT_ENABLE_HOTSPOT_CHECKSUM): Provide
+	--disable-hotspot-checksum option.
+	* configure.ac: Replace calls to
+	IT_WITH_X_SRC_ZIP macros with calls
+	to IT_ENABLE_X_CHECKSUM macros, which
+	in turn require the IT_WITH_X_SRC_ZIP
+	macro.
+
 2015-07-15  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR1374: Provide option to strip and link debugging

--- a/INSTALL	Wed Jul 15 14:34:19 2015 +0100
+++ b/INSTALL	Wed Jul 15 23:36:38 2015 +0100
@@ -157,18 +157,45 @@
     - /usr/share/java/ecj.jar
     - /usr/share/eclipse-ecj-3.{2,3,4,5}/lib/ecj.jar
 * --with-openjdk-src-zip: Specify the location of the OpenJDK tarball to avoid downloading.
+* --disable-openjdk-checksum: Don't check that the tarball specified by --with-openjdk-src-zip
+  has the same checksum as the expected OpenJDK source zip, so a locally modified version can
+  be used instead.
 * --with-hotspot-src-zip: Specify the location of the HotSpot tarball to avoid downloading.
+* --disable-hotspot-checksum: Don't check that the tarball specified by --with-hotspot-src-zip
+  has the same checksum as the expected HotSpot source zip, so a locally modified version can
+  be used instead.
 * --with-corba-src-zip: Specify the location of the CORBA tarball to avoid downloading.
+* --disable-corba-checksum: Don't check that the tarball specified by --with-corba-src-zip
+  has the same checksum as the expected CORBA source zip, so a locally modified version can
+  be used instead.
 * --with-jaxp-src-zip: Specify the location of the JAXP tarball to avoid downloading.
+* --disable-jaxp-checksum: Don't check that the tarball specified by --with-jaxp-src-zip
+  has the same checksum as the expected JAXP source zip, so a locally modified version can
+  be used instead.
 * --with-jaxws-src-zip: Specify the location of the JAXWS tarball to avoid downloading.
+* --disable-jaxws-checksum: Don't check that the tarball specified by --with-jaxws-src-zip
+  has the same checksum as the expected JAXWS source zip, so a locally modified version can
+  be used instead.
 * --with-jdk-src-zip: Specify the location of the JDK tarball to avoid downloading.
+* --disable-jdk-checksum: Don't check that the tarball specified by --with-jdk-src-zip
+  has the same checksum as the expected JDK source zip, so a locally modified version can
+  be used instead.
 * --with-langtools-src-zip: Specify the location of the langtools tarball to avoid downloading.
+* --disable-langtools-checksum: Don't check that the tarball specified by --with-langtools-src-zip
+  has the same checksum as the expected langtools source zip, so a locally modified version can
+  be used instead.
 * --with-alt-jar: Use the specified jar binary in the second stage rather than the one just built.
 * --with-cacao-home: Specify the location of an installed CACAO to use rather than downloading
   and building one.
 * --with-cacao-src-zip: Specify the location of a CACAO tarball to avoid downloading.
+* --disable-cacao-checksum: Don't check that the tarball specified by --with-cacao-src-zip
+  has the same checksum as the expected CACAO source zip, so a locally modified version can
+  be used instead.
 * --with-cacao-src-dir: Specify the location of a CACAO source tree to avoid downloading.
 * --with-jamvm-src-zip: Specify the location of a JamVM tarball to avoid downloading.
+* --disable-jamvm-checksum: Don't check that the tarball specified by --with-jamvm-src-zip
+  has the same checksum as the expected JamVM source zip, so a locally modified version can
+  be used instead.
 * --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
 * --with-tzdata-dir: Specify the location of Java timezone data, defaulting to /usr/share/javazi.
 * --with-llvm-config: Specify the location of the llvm-config binary.

--- a/Makefile.am	Wed Jul 15 14:34:19 2015 +0100
+++ b/Makefile.am	Wed Jul 15 23:36:38 2015 +0100
@@ -169,6 +169,60 @@
   HOTSPOT_SRC_ZIP = hotspot.$(TAR_SUFFIX)
 endif
 
+if DISABLE_OPENJDK_CHECKSUM
+OPENJDK_SHA256SUM_BIN = true
+else
+OPENJDK_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_CORBA_CHECKSUM
+CORBA_SHA256SUM_BIN = true
+else
+CORBA_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_JAXP_CHECKSUM
+JAXP_SHA256SUM_BIN = true
+else
+JAXP_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_JAXWS_CHECKSUM
+JAXWS_SHA256SUM_BIN = true
+else
+JAXWS_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_JDK_CHECKSUM
+JDK_SHA256SUM_BIN = true
+else
+JDK_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_LANGTOOLS_CHECKSUM
+LANGTOOLS_SHA256SUM_BIN = true
+else
+LANGTOOLS_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_CACAO_CHECKSUM
+CACAO_SHA256SUM_BIN = true
+else
+CACAO_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_JAMVM_CHECKSUM
+JAMVM_SHA256SUM_BIN = true
+else
+JAMVM_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
+if DISABLE_HOTSPOT_CHECKSUM
+HOTSPOT_SHA256SUM_BIN = true
+else
+HOTSPOT_SHA256SUM_BIN = $(SHA256SUM)
+endif
+
 if WITH_HGREV
 REV_ARG = -r $(HGREV)
 endif
@@ -910,7 +964,7 @@
 	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
 endif
 	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(OPENJDK_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ -e $(OPENJDK_SRC_ZIP) ] ; then \
@@ -939,7 +993,7 @@
 	ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
 endif
 	if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(CORBA_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ $(CORBA_SRC_ZIP) ] ; then \
@@ -968,7 +1022,7 @@
 	ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
 endif
 	if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(JAXP_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ $(JAXP_SRC_ZIP) ] ; then \
@@ -997,7 +1051,7 @@
 	ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
 endif
 	if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(JAXWS_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ $(JAXWS_SRC_ZIP) ] ; then \
@@ -1026,7 +1080,7 @@
 	ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
 endif
 	if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(JDK_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ $(JDK_SRC_ZIP) ] ; then \
@@ -1055,7 +1109,7 @@
 	ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
 endif
 	if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(LANGTOOLS_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ $(LANGTOOLS_SRC_ZIP) ] ; then \
@@ -1120,7 +1174,7 @@
 	ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
 endif
 	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
-	 | $(SHA256SUM) --check ; \
+	 | $(CACAO_SHA256SUM_BIN) --check ; \
 	then \
 	 if test "x$(enable_downloading)" = "xyes"; then \
 	   if [ -e $(CACAO_SRC_ZIP) ] ; then \
@@ -1151,7 +1205,7 @@
 	ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP)
 endif
 	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
-	 | $(SHA256SUM) --check ; \
+	 | $(JAMVM_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ -e $(JAMVM_SRC_ZIP) ] ; then \
@@ -1184,7 +1238,7 @@
 endif
 	echo "Using HotSpot build: ${HSBUILD}"
 	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
-	  | $(SHA256SUM) --check ; \
+	  | $(HOTSPOT_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
 	    if [ -e $(HOTSPOT_SRC_ZIP) ] ; then \

--- a/NEWS	Wed Jul 15 14:34:19 2015 +0100
+++ b/NEWS	Wed Jul 15 23:36:38 2015 +0100
@@ -308,6 +308,7 @@
   - PR1846: Build fails when using IcedTea7 as bootstrap JDK with native ecj
   - PR1847: Synchronise javac.in with IcedTea6
   - PR1883: Search Debian multiarch paths when looking for pcsclite
+  - PR1888: Allow tarball checksumming to be disabled
   - PR2060: Fix warnings found by Gentoo ebuild QA with gcc 4.9.1
   - PR2144: make dist fails due to lack of HotSpot-specific patches
   - PR2161: RHEL 6 has a version of GIO which meets the version criteria, but has no g_settings_*

--- a/acinclude.m4	Wed Jul 15 14:34:19 2015 +0100
+++ b/acinclude.m4	Wed Jul 15 23:36:38 2015 +0100
@@ -556,7 +556,7 @@
   AC_SUBST([NATIVE2ASCII])
 ])
 
-AC_DEFUN([IT_WITH_OPENJDK_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_OPENJDK_SRC_ZIP],
 [
   AC_MSG_CHECKING([for an OpenJDK source zip])
   AC_ARG_WITH([openjdk-src-zip],
@@ -818,7 +818,7 @@
   AC_SUBST(CACAO_IMPORT_PATH)
 ])
 
-AC_DEFUN([IT_WITH_CACAO_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_CACAO_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a CACAO source zip])
   AC_ARG_WITH([cacao-src-zip],
@@ -948,7 +948,7 @@
   AM_CONDITIONAL(WITH_ALT_HSBUILD, test "x${HSBUILD}" != "xdefault")
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a HotSpot source zip])
   AC_ARG_WITH([hotspot-src-zip],
@@ -969,7 +969,7 @@
   AC_SUBST(ALT_HOTSPOT_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_WITH_CORBA_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_CORBA_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a CORBA source zip])
   AC_ARG_WITH([corba-src-zip],
@@ -990,7 +990,7 @@
   AC_SUBST(ALT_CORBA_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_WITH_JAXP_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_JAXP_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a JAXP source zip])
   AC_ARG_WITH([jaxp-src-zip],
@@ -1011,7 +1011,7 @@
   AC_SUBST(ALT_JAXP_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_WITH_JAXWS_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_JAXWS_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a JAXWS source zip])
   AC_ARG_WITH([jaxws-src-zip],
@@ -1032,7 +1032,7 @@
   AC_SUBST(ALT_JAXWS_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_WITH_JDK_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_JDK_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a JDK source zip])
   AC_ARG_WITH([jdk-src-zip],
@@ -1053,7 +1053,7 @@
   AC_SUBST(ALT_JDK_SRC_ZIP)
 ])
 
-AC_DEFUN([IT_WITH_LANGTOOLS_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_LANGTOOLS_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a langtools source zip])
   AC_ARG_WITH([langtools-src-zip],
@@ -2262,7 +2262,7 @@
   AC_SUBST(ENABLE_JAMVM)
 ])
 
-AC_DEFUN([IT_WITH_JAMVM_SRC_ZIP],
+AC_DEFUN_ONCE([IT_WITH_JAMVM_SRC_ZIP],
 [
   AC_MSG_CHECKING([for a JamVM source zip])
   AC_ARG_WITH([jamvm-src-zip],
@@ -3028,7 +3028,14 @@
   AC_ARG_ENABLE([non-nss-curves],
 	      [AS_HELP_STRING(--enable-non-nss-curves,register curves beyond the 3 NSS defines [[default=no]])],
   [
-    ENABLE_NON_NSS_CURVES="${enableval}"
+    case "${enableval}" in
+      no)
+	ENABLE_NON_NSS_CURVES=no
+        ;;
+      *)
+        ENABLE_NON_NSS_CURVES=yes
+        ;;
+    esac
   ],
   [
     ENABLE_NON_NSS_CURVES="no"
@@ -3069,3 +3076,246 @@
   AM_CONDITIONAL([SPLIT_DEBUGINFO], test x"${enable_split_debuginfo}" = "xyes")
   AC_SUBST([enable_split_debuginfo])
 ])
+
+AC_DEFUN_ONCE([IT_ENABLE_OPENJDK_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_OPENJDK_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified OpenJDK tarball])
+  AC_ARG_ENABLE([openjdk-checksum],
+	      [AS_HELP_STRING(--disable-openjdk-checksum,checksum the specified OpenJDK tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_OPENJDK_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_OPENJDK_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_OPENJDK_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_OPENJDK_CHECKSUM})
+  if test "x${ENABLE_OPENJDK_CHECKSUM}" = "xno" -a "x${ALT_OPENJDK_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No OpenJDK source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_OPENJDK_CHECKSUM, test x"${ENABLE_OPENJDK_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_OPENJDK_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_CORBA_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_CORBA_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified CORBA tarball])
+  AC_ARG_ENABLE([corba-checksum],
+	      [AS_HELP_STRING(--disable-corba-checksum,checksum the specified CORBA tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_CORBA_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_CORBA_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_CORBA_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_CORBA_CHECKSUM})
+  if test "x${ENABLE_CORBA_CHECKSUM}" = "xno" -a "x${ALT_CORBA_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No CORBA source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_CORBA_CHECKSUM, test x"${ENABLE_CORBA_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_CORBA_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_JAXP_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_JAXP_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified JAXP tarball])
+  AC_ARG_ENABLE([jaxp-checksum],
+	      [AS_HELP_STRING(--disable-jaxp-checksum,checksum the specified JAXP tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_JAXP_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_JAXP_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_JAXP_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_JAXP_CHECKSUM})
+  if test "x${ENABLE_JAXP_CHECKSUM}" = "xno" -a "x${ALT_JAXP_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No JAXP source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_JAXP_CHECKSUM, test x"${ENABLE_JAXP_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_JAXP_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_JAXWS_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_JAXWS_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified JAXWS tarball])
+  AC_ARG_ENABLE([jaxws-checksum],
+	      [AS_HELP_STRING(--disable-jaxws-checksum,checksum the specified JAXWS tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_JAXWS_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_JAXWS_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_JAXWS_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_JAXWS_CHECKSUM})
+  if test "x${ENABLE_JAXWS_CHECKSUM}" = "xno" -a "x${ALT_JAXWS_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No JAXWS source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_JAXWS_CHECKSUM, test x"${ENABLE_JAXWS_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_JAXWS_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_JDK_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_JDK_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified JDK tarball])
+  AC_ARG_ENABLE([jdk-checksum],
+	      [AS_HELP_STRING(--disable-jdk-checksum,checksum the specified JDK tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_JDK_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_JDK_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_JDK_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_JDK_CHECKSUM})
+  if test "x${ENABLE_JDK_CHECKSUM}" = "xno" -a "x${ALT_JDK_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No JDK source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_JDK_CHECKSUM, test x"${ENABLE_JDK_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_JDK_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_LANGTOOLS_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_LANGTOOLS_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified langtools tarball])
+  AC_ARG_ENABLE([langtools-checksum],
+	      [AS_HELP_STRING(--disable-langtools-checksum,checksum the specified langtools tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_LANGTOOLS_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_LANGTOOLS_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_LANGTOOLS_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_LANGTOOLS_CHECKSUM})
+  if test "x${ENABLE_LANGTOOLS_CHECKSUM}" = "xno" -a "x${ALT_LANGTOOLS_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No langtools source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_LANGTOOLS_CHECKSUM, test x"${ENABLE_LANGTOOLS_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_LANGTOOLS_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_CACAO_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_CACAO_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified CACAO tarball])
+  AC_ARG_ENABLE([cacao-checksum],
+	      [AS_HELP_STRING(--disable-cacao-checksum,checksum the specified CACAO tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_CACAO_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_CACAO_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_CACAO_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_CACAO_CHECKSUM})
+  if test "x${ENABLE_CACAO_CHECKSUM}" = "xno" -a "x${ALT_CACAO_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No CACAO source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_CACAO_CHECKSUM, test x"${ENABLE_CACAO_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_CACAO_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_JAMVM_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_JAMVM_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified JamVM tarball])
+  AC_ARG_ENABLE([jamvm-checksum],
+	      [AS_HELP_STRING(--disable-jamvm-checksum,checksum the specified JamVM tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_JAMVM_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_JAMVM_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_JAMVM_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_JAMVM_CHECKSUM})
+  if test "x${ENABLE_JAMVM_CHECKSUM}" = "xno" -a "x${ALT_JAMVM_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No JamVM source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_JAMVM_CHECKSUM, test x"${ENABLE_JAMVM_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_JAMVM_CHECKSUM)
+])
+
+AC_DEFUN_ONCE([IT_ENABLE_HOTSPOT_CHECKSUM],
+[
+  AC_REQUIRE([IT_WITH_HOTSPOT_SRC_ZIP])
+  AC_MSG_CHECKING([whether to enable checksumming of the specified HotSpot tarball])
+  AC_ARG_ENABLE([hotspot-checksum],
+	      [AS_HELP_STRING(--disable-hotspot-checksum,checksum the specified HotSpot tarball [[default=yes]])],
+  [
+    case "${enableval}" in
+      no)
+	ENABLE_HOTSPOT_CHECKSUM=no
+        ;;
+      *)
+        ENABLE_HOTSPOT_CHECKSUM=yes
+        ;;
+    esac
+  ],
+  [
+    ENABLE_HOTSPOT_CHECKSUM="yes"
+  ])
+  AC_MSG_RESULT(${ENABLE_HOTSPOT_CHECKSUM})
+  if test "x${ENABLE_HOTSPOT_CHECKSUM}" = "xno" -a "x${ALT_HOTSPOT_SRC_ZIP}" = "xnot specified"; then
+    AC_MSG_WARN([No HotSpot source tarball specified; downloaded tarballs are always checksummed.])
+  fi
+  AM_CONDITIONAL(DISABLE_HOTSPOT_CHECKSUM, test x"${ENABLE_HOTSPOT_CHECKSUM}" = "xno")
+  AC_SUBST(ENABLE_HOTSPOT_CHECKSUM)
+])

--- a/configure.ac	Wed Jul 15 14:34:19 2015 +0100
+++ b/configure.ac	Wed Jul 15 23:36:38 2015 +0100
@@ -160,21 +160,21 @@
 IT_ENABLE_QUEENS_TEST
 
 IT_FIND_RHINO_JAR
-IT_WITH_OPENJDK_SRC_ZIP
-IT_WITH_HOTSPOT_SRC_ZIP
-IT_WITH_CORBA_SRC_ZIP
-IT_WITH_JAXP_SRC_ZIP
-IT_WITH_JAXWS_SRC_ZIP
-IT_WITH_JDK_SRC_ZIP
-IT_WITH_LANGTOOLS_SRC_ZIP
+IT_ENABLE_OPENJDK_CHECKSUM
+IT_ENABLE_HOTSPOT_CHECKSUM
+IT_ENABLE_CORBA_CHECKSUM
+IT_ENABLE_JAXP_CHECKSUM
+IT_ENABLE_JAXWS_CHECKSUM
+IT_ENABLE_JDK_CHECKSUM
+IT_ENABLE_LANGTOOLS_CHECKSUM
 IT_WITH_ALT_JAR_BINARY
 
 IT_ENABLE_CACAO
 IT_WITH_CACAO_HOME
-IT_WITH_CACAO_SRC_ZIP
 IT_WITH_CACAO_SRC_DIR
+IT_ENABLE_CACAO_CHECKSUM
 IT_ENABLE_JAMVM
-IT_WITH_JAMVM_SRC_ZIP
+IT_ENABLE_JAMVM_CHECKSUM
 
 IT_DISABLE_OPTIMIZATIONS
 IT_ENABLE_WERROR