--- a/ChangeLog	Fri Apr 01 02:35:07 2016 +0100
+++ b/ChangeLog	Fri Apr 01 03:10:31 2016 +0100
@@ -1,3 +1,124 @@
+2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2547: Extend tarball checksumming option to
+	allow the checksum to be specified
+	* INSTALL: Update documentation, replacing
+	the --disable-nashorn-checksum option with
+	the --with--nashorn-checksum option.
+	* Makefile.am:
+	(NASHORN_SUM): Set to either NASHORN_SHA256SUM
+	or the checksum supplied by the user.
+	(download-nashorn): Use NASHORN_SUM instead
+	of NASHORN_SHA256SUM directly.
+	* acinclude.m4:
+	(IT_ENABLE_NASHORN_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_NASHORN_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+
+2015-07-16  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2547: Extend tarball checksumming option to
+	allow the checksum to be specified
+	* INSTALL: Update documentation, replacing
+	--disable-x-checksum options with
+	--with-x-checksum options.
+	* Makefile.am:
+	(OPENJDK_SUM): Set to either OPENJDK_SHA256SUM
+	or the checksum supplied by the user.
+	(CORBA_SUM): Set to either CORBA_SHA256SUM
+	or the checksum supplied by the user.
+	(JAXP_SUM): Set to either JAXP_SHA256SUM
+	or the checksum supplied by the user.
+	(JAXWS_SUM): Set to either JAXWS_SHA256SUM
+	or the checksum supplied by the user.
+	(JDK_SUM): Set to either JDK_SHA256SUM
+	or the checksum supplied by the user.
+	(LANGTOOLS_SUM): Set to either LANGTOOLS_SHA256SUM
+	or the checksum supplied by the user.
+	(CACAO_SUM): Set to either CACAO_SHA256SUM
+	or the checksum supplied by the user.
+	(JAMVM_SUM): Set to either JAMVM_SHA256SUM
+	or the checksum supplied by the user.
+	(HOTSPOT_SUM): Set to either HS_SHA256SUM
+	or the checksum supplied by the user.
+	(download-openjdk): Use OPENJDK_SUM instead
+	of OPENJDK_SHA256SUM directly.
+	(download-corba): Use CORBA_SUM instead
+	of CORBA_SHA256SUM directly.
+	(download-jaxp): Use JAXP_SUM instead
+	of JAXP_SHA256SUM directly.
+	(download-jaxws): Use JAXWS_SUM instead
+	of JAXWS_SHA256SUM directly.
+	(download-jdk): Use JDK_SUM instead
+	of JDK_SHA256SUM directly.
+	(download-langtools): Use LANGTOOLS_SUM instead
+	of LANGTOOLS_SHA256SUM directly.
+	(download-cacao): Use CACAO_SUM instead
+	of CACAO_SHA256SUM directly.
+	(download-jamvm): Use JAMVM_SUM instead
+	of JAMVM_SHA256SUM directly.
+	(download-hotspot): Use HOTSPOT_SUM instead
+	of HS_SHA256SUM directly.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_ENABLE_OPENJDK_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_OPENJDK_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_CORBA_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_CORBA_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_JAXP_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_JAXP_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_JAXWS_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_JAXWS_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_JDK_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_JDK_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_LANGTOOLS_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_LANGTOOLS_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_CACAO_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_CACAO_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_JAMVM_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_JAMVM_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+	(IT_ENABLE_HOTSPOT_CHECKSUM): Change from
+	an enablement option to a with option, so
+	that the user can specify a checksum.
+	The conditional WITH_HOTSPOT_CHECKSUM is
+	set if the specified value is other than
+	"yes" or "no".
+
 2016-03-31  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2544: Desktop files do not allow installation from

--- a/INSTALL	Fri Apr 01 02:35:07 2016 +0100
+++ b/INSTALL	Fri Apr 01 03:10:31 2016 +0100
@@ -122,49 +122,69 @@
     - /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-openjdk-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-openjdk-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-openjdk-checksum doesn't check the tarball specified by
+  --with-openjdk-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-hotspot-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-hotspot-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-hotspot-checksum doesn't check the tarball specified by
+  --with-hotspot-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-corba-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-corba-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-corba-checksum doesn't check the tarball specified by
+  --with-corba-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-jaxp-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-jaxp-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-jaxp-checksum doesn't check the tarball specified by
+  --with-jaxp-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-jaxws-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-jaxws-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-jaxws-checksum doesn't check the tarball specified by
+  --with-jaxws-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-jdk-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-jdk-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-jdk-checksum doesn't check the tarball specified by
+  --with-jdk-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-langtools-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-langtools-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-langtools-checksum doesn't check the tarball specified by
+  --with-langtools-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --with-nashorn-src-zip: Specify the location of the Nashorn tarball to avoid downloading.
-* --disable-nashorn-checksum: Don't check that the tarball specified by --with-nashorn-src-zip
-  has the same checksum as the expected Nashorn source zip, so a locally modified version can
-  be used instead.
+* --with-nashorn-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-nashorn-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-nashorn-checksum doesn't check the tarball specified by
+  --with-nashorn-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-cacao-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-cacao-checksum doesn't check the tarball specified by
+  --with-cacao-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --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-jamvm-checksum: Specify a SHA256 checksum for the supplied source zip. Alternatively,
+  --with-jamvm-checksum without an argument (the default) uses the expected upstream SHA256
+  checksum, while --without-jamvm-checksum doesn't check the tarball specified by
+  --with-jamvm-src-zip at all. This option allows a locally modified version of the source
+  tarball to be used instead of the standard versions.
 * --with-hg-revision: Specify a hg revision to use (as opposed to tip) with the --enable-hg option.
 * --with-abs-install-dir: The final install location of the j2sdk-image, for use in the SystemTap tapset.
 * --with-llvm-config: Specify the location of the llvm-config binary.

--- a/Makefile.am	Fri Apr 01 02:35:07 2016 +0100
+++ b/Makefile.am	Fri Apr 01 03:10:31 2016 +0100
@@ -139,60 +139,120 @@
 OPENJDK_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_OPENJDK_CHECKSUM
+OPENJDK_SUM = @OPENJDK_CHECKSUM@
+else
+OPENJDK_SUM = $(OPENJDK_SHA256SUM)
+endif
+
 if DISABLE_CORBA_CHECKSUM
 CORBA_SHA256SUM_BIN = true
 else
 CORBA_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_CORBA_CHECKSUM
+CORBA_SUM = @CORBA_CHECKSUM@
+else
+CORBA_SUM = $(CORBA_SHA256SUM)
+endif
+
 if DISABLE_JAXP_CHECKSUM
 JAXP_SHA256SUM_BIN = true
 else
 JAXP_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_JAXP_CHECKSUM
+JAXP_SUM = @JAXP_CHECKSUM@
+else
+JAXP_SUM = $(JAXP_SHA256SUM)
+endif
+
 if DISABLE_JAXWS_CHECKSUM
 JAXWS_SHA256SUM_BIN = true
 else
 JAXWS_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_JAXWS_CHECKSUM
+JAXWS_SUM = @JAXWS_CHECKSUM@
+else
+JAXWS_SUM = $(JAXWS_SHA256SUM)
+endif
+
 if DISABLE_JDK_CHECKSUM
 JDK_SHA256SUM_BIN = true
 else
 JDK_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_JDK_CHECKSUM
+JDK_SUM = @JDK_CHECKSUM@
+else
+JDK_SUM = $(JDK_SHA256SUM)
+endif
+
 if DISABLE_LANGTOOLS_CHECKSUM
 LANGTOOLS_SHA256SUM_BIN = true
 else
 LANGTOOLS_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_LANGTOOLS_CHECKSUM
+LANGTOOLS_SUM = @LANGTOOLS_CHECKSUM@
+else
+LANGTOOLS_SUM = $(LANGTOOLS_SHA256SUM)
+endif
+
 if DISABLE_CACAO_CHECKSUM
 CACAO_SHA256SUM_BIN = true
 else
 CACAO_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_CACAO_CHECKSUM
+CACAO_SUM = @CACAO_CHECKSUM@
+else
+CACAO_SUM = $(CACAO_SHA256SUM)
+endif
+
 if DISABLE_JAMVM_CHECKSUM
 JAMVM_SHA256SUM_BIN = true
 else
 JAMVM_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_JAMVM_CHECKSUM
+JAMVM_SUM = @JAMVM_CHECKSUM@
+else
+JAMVM_SUM = $(JAMVM_SHA256SUM)
+endif
+
 if DISABLE_HOTSPOT_CHECKSUM
 HOTSPOT_SHA256SUM_BIN = true
 else
 HOTSPOT_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_HOTSPOT_CHECKSUM
+HOTSPOT_SUM = @HOTSPOT_CHECKSUM@
+else
+HOTSPOT_SUM = $(HS_SHA256SUM)
+endif
+
 if DISABLE_NASHORN_CHECKSUM
 NASHORN_SHA256SUM_BIN = true
 else
 NASHORN_SHA256SUM_BIN = $(SHA256SUM)
 endif
 
+if WITH_NASHORN_CHECKSUM
+NASHORN_SUM = @NASHORN_CHECKSUM@
+else
+NASHORN_SUM = $(NASHORN_SHA256SUM)
+endif
+
 if WITH_HGREV
 REV_ARG = -r $(HGREV)
 endif
@@ -758,7 +818,7 @@
 if USE_ALT_OPENJDK_SRC_ZIP
 	ln -sf $(ALT_OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP)
 endif
-	if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
+	if ! echo "$(OPENJDK_SUM)  $(OPENJDK_SRC_ZIP)" \
 	  | $(OPENJDK_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -766,7 +826,7 @@
 	      mv $(OPENJDK_SRC_ZIP) $(OPENJDK_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(OPENJDK_SRC_ZIP); \
-	    if ! echo "$(OPENJDK_SHA256SUM)  $(OPENJDK_SRC_ZIP)" \
+	    if ! echo "$(OPENJDK_SUM)  $(OPENJDK_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of OpenJDK root zip"; false; \
 	    fi; \
@@ -787,7 +847,7 @@
 if USE_ALT_CORBA_SRC_ZIP
 	ln -sf $(ALT_CORBA_SRC_ZIP) $(CORBA_SRC_ZIP)
 endif
-	if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
+	if ! echo "$(CORBA_SUM)  $(CORBA_SRC_ZIP)" \
 	  | $(CORBA_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -795,7 +855,7 @@
 	      mv $(CORBA_SRC_ZIP) $(CORBA_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(CORBA_SRC_ZIP); \
-	    if ! echo "$(CORBA_SHA256SUM)  $(CORBA_SRC_ZIP)" \
+	    if ! echo "$(CORBA_SUM)  $(CORBA_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of CORBA zip"; false; \
 	    fi; \
@@ -816,7 +876,7 @@
 if USE_ALT_JAXP_SRC_ZIP
 	ln -sf $(ALT_JAXP_SRC_ZIP) $(JAXP_SRC_ZIP)
 endif
-	if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
+	if ! echo "$(JAXP_SUM)  $(JAXP_SRC_ZIP)" \
 	  | $(JAXP_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -824,7 +884,7 @@
 	      mv $(JAXP_SRC_ZIP) $(JAXP_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(JAXP_SRC_ZIP); \
-	    if ! echo "$(JAXP_SHA256SUM)  $(JAXP_SRC_ZIP)" \
+	    if ! echo "$(JAXP_SUM)  $(JAXP_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JAXP zip"; false; \
 	    fi; \
@@ -845,7 +905,7 @@
 if USE_ALT_JAXWS_SRC_ZIP
 	ln -sf $(ALT_JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP)
 endif
-	if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
+	if ! echo "$(JAXWS_SUM)  $(JAXWS_SRC_ZIP)" \
 	  | $(JAXWS_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -853,7 +913,7 @@
 	      mv $(JAXWS_SRC_ZIP) $(JAXWS_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(JAXWS_SRC_ZIP); \
-	    if ! echo "$(JAXWS_SHA256SUM)  $(JAXWS_SRC_ZIP)" \
+	    if ! echo "$(JAXWS_SUM)  $(JAXWS_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JAXWS zip"; false; \
 	    fi; \
@@ -874,7 +934,7 @@
 if USE_ALT_JDK_SRC_ZIP
 	ln -sf $(ALT_JDK_SRC_ZIP) $(JDK_SRC_ZIP)
 endif
-	if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
+	if ! echo "$(JDK_SUM)  $(JDK_SRC_ZIP)" \
 	  | $(JDK_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -882,7 +942,7 @@
 	      mv $(JDK_SRC_ZIP) $(JDK_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(JDK_SRC_ZIP); \
-	    if ! echo "$(JDK_SHA256SUM)  $(JDK_SRC_ZIP)" \
+	    if ! echo "$(JDK_SUM)  $(JDK_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JDK zip"; false; \
 	    fi; \
@@ -903,7 +963,7 @@
 if USE_ALT_LANGTOOLS_SRC_ZIP
 	ln -sf $(ALT_LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP)
 endif
-	if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
+	if ! echo "$(LANGTOOLS_SUM)  $(LANGTOOLS_SRC_ZIP)" \
 	  | $(LANGTOOLS_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -911,7 +971,7 @@
 	      mv $(LANGTOOLS_SRC_ZIP) $(LANGTOOLS_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(LANGTOOLS_SRC_ZIP); \
-	    if ! echo "$(LANGTOOLS_SHA256SUM)  $(LANGTOOLS_SRC_ZIP)" \
+	    if ! echo "$(LANGTOOLS_SUM)  $(LANGTOOLS_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of langtools zip"; false; \
 	    fi; \
@@ -968,7 +1028,7 @@
 if USE_ALT_CACAO_SRC_ZIP
 	ln -sf $(ALT_CACAO_SRC_ZIP) $(CACAO_SRC_ZIP)
 endif
-	if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
+	if ! echo "$(CACAO_SUM)  $(CACAO_SRC_ZIP)" \
 	 | $(CACAO_SHA256SUM_BIN) --check ; \
 	then \
 	 if test "x$(enable_downloading)" = "xyes"; then \
@@ -976,7 +1036,7 @@
 	     mv $(CACAO_SRC_ZIP) $(CACAO_SRC_ZIP).old ; \
 	   fi ; \
 	   $(WGET) $(CACAO_URL) -O $(CACAO_SRC_ZIP); \
-	   if ! echo "$(CACAO_SHA256SUM)  $(CACAO_SRC_ZIP)" \
+	   if ! echo "$(CACAO_SUM)  $(CACAO_SRC_ZIP)" \
 	     | $(SHA256SUM) --check ; then \
 	     echo "ERROR: Bad download of CACAO zip"; false; \
 	   fi; \
@@ -999,7 +1059,7 @@
 if USE_ALT_JAMVM_SRC_ZIP
 	ln -sf $(ALT_JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP)
 endif
-	if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
+	if ! echo "$(JAMVM_SUM)  $(JAMVM_SRC_ZIP)" \
 	 | $(JAMVM_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -1007,7 +1067,7 @@
 	      mv $(JAMVM_SRC_ZIP) $(JAMVM_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(JAMVM_URL) -O $(JAMVM_SRC_ZIP); \
-	    if ! echo "$(JAMVM_SHA256SUM)  $(JAMVM_SRC_ZIP)" \
+	    if ! echo "$(JAMVM_SUM)  $(JAMVM_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of JamVM zip"; false; \
 	    fi; \
@@ -1032,7 +1092,7 @@
 if USE_ALT_NASHORN_SRC_ZIP
 	ln -sf $(ALT_NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP)
 endif
-	if ! echo "$(NASHORN_SHA256SUM)  $(NASHORN_SRC_ZIP)" \
+	if ! echo "$(NASHORN_SUM)  $(NASHORN_SRC_ZIP)" \
 	  | $(NASHORN_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -1040,7 +1100,7 @@
 	      mv $(NASHORN_SRC_ZIP) $(NASHORN_SRC_ZIP).old ; \
 	    fi ; \
 	    $(WGET) $(ICEDTEA_URL)/$(NASHORN_SRC_ZIP); \
-	    if ! echo "$(NASHORN_SHA256SUM)  $(NASHORN_SRC_ZIP)" \
+	    if ! echo "$(NASHORN_SUM)  $(NASHORN_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of NASHORN zip"; false; \
 	    fi; \
@@ -1068,7 +1128,7 @@
 	ln -sf $(ALT_HOTSPOT_SRC_ZIP) $(HOTSPOT_SRC_ZIP)
 endif
 	echo "Using HotSpot build: ${HSBUILD}"
-	if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
+	if ! echo "$(HOTSPOT_SUM)  $(HOTSPOT_SRC_ZIP)" \
 	  | $(HOTSPOT_SHA256SUM_BIN) --check ; \
 	then \
 	  if test "x$(enable_downloading)" = "xyes"; then \
@@ -1080,7 +1140,7 @@
 	    else \
 	      $(WGET) $(HS_URL)/$(HOTSPOT_SRC_ZIP) ; \
             fi ; \
-	    if ! echo "$(HS_SHA256SUM)  $(HOTSPOT_SRC_ZIP)" \
+	    if ! echo "$(HOTSPOT_SUM)  $(HOTSPOT_SRC_ZIP)" \
 	      | $(SHA256SUM) --check ; then \
 	      echo "ERROR: Bad download of HotSpot zip"; false; \
 	    fi; \

--- a/NEWS	Fri Apr 01 02:35:07 2016 +0100
+++ b/NEWS	Fri Apr 01 03:10:31 2016 +0100
@@ -129,6 +129,7 @@
   - PR2511: Reset success following calls in LayoutManager.cpp
   - PR2541: Allow the user to specify the cacerts file to use
   - PR2544: Desktop files do not allow installation from multiple versions of IcedTea 
+  - PR2547: Extend tarball checksumming option to allow the checksum to be specified
   - PR2631: jvm.cfg missing for ppc64le
   - PR2633: s390 builds still fail as BUILD_NUM_BITS is never set
   - PR2675: Update ppc64le autotools infrastructure following PR2237

--- a/acinclude.m4	Fri Apr 01 02:35:07 2016 +0100
+++ b/acinclude.m4	Fri Apr 01 03:10:31 2016 +0100
@@ -2026,243 +2026,189 @@
 [
   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]])],
+  AC_ARG_WITH([openjdk-checksum],
+	      [AS_HELP_STRING(--with-openjdk-checksum,checksum the specified OpenJDK tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_OPENJDK_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_OPENJDK_CHECKSUM=yes
-        ;;
-    esac
+    OPENJDK_CHECKSUM=${withval}
   ],
   [
-    ENABLE_OPENJDK_CHECKSUM="yes"
+    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_RESULT(${OPENJDK_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_OPENJDK_CHECKSUM, test x"${OPENJDK_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_OPENJDK_CHECKSUM, test x"${OPENJDK_CHECKSUM}" != "xyes" -a x"${OPENJDK_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([corba-checksum],
+	      [AS_HELP_STRING(--with-corba-checksum,checksum the specified CORBA tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_CORBA_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_CORBA_CHECKSUM=yes
-        ;;
-    esac
+    CORBA_CHECKSUM=${withval}
   ],
   [
-    ENABLE_CORBA_CHECKSUM="yes"
+    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_RESULT(${CORBA_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_CORBA_CHECKSUM, test x"${CORBA_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_CORBA_CHECKSUM, test x"${CORBA_CHECKSUM}" != "xyes" -a x"${CORBA_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([jaxp-checksum],
+	      [AS_HELP_STRING(--with-jaxp-checksum,checksum the specified JAXP tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_JAXP_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_JAXP_CHECKSUM=yes
-        ;;
-    esac
+    JAXP_CHECKSUM=${withval}
   ],
   [
-    ENABLE_JAXP_CHECKSUM="yes"
+    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_RESULT(${JAXP_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_JAXP_CHECKSUM, test x"${JAXP_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_JAXP_CHECKSUM, test x"${JAXP_CHECKSUM}" != "xyes" -a x"${JAXP_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([jaxws-checksum],
+	      [AS_HELP_STRING(--with-jaxws-checksum,checksum the specified JAXWS tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_JAXWS_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_JAXWS_CHECKSUM=yes
-        ;;
-    esac
+    JAXWS_CHECKSUM=${withval}
   ],
   [
-    ENABLE_JAXWS_CHECKSUM="yes"
+    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_RESULT(${JAXWS_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_JAXWS_CHECKSUM, test x"${JAXWS_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_JAXWS_CHECKSUM, test x"${JAXWS_CHECKSUM}" != "xyes" -a x"${JAXWS_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([jdk-checksum],
+	      [AS_HELP_STRING(--with-jdk-checksum,checksum the specified JDK tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_JDK_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_JDK_CHECKSUM=yes
-        ;;
-    esac
+    JDK_CHECKSUM=${withval}
   ],
   [
-    ENABLE_JDK_CHECKSUM="yes"
+    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_RESULT(${JDK_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_JDK_CHECKSUM, test x"${JDK_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_JDK_CHECKSUM, test x"${JDK_CHECKSUM}" != "xyes" -a x"${JDK_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([langtools-checksum],
+	      [AS_HELP_STRING(--with-langtools-checksum,checksum the specified langtools tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_LANGTOOLS_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_LANGTOOLS_CHECKSUM=yes
-        ;;
-    esac
+    LANGTOOLS_CHECKSUM=${withval}
   ],
   [
-    ENABLE_LANGTOOLS_CHECKSUM="yes"
+    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_RESULT(${LANGTOOLS_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_LANGTOOLS_CHECKSUM, test x"${LANGTOOLS_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_LANGTOOLS_CHECKSUM, test x"${LANGTOOLS_CHECKSUM}" != "xyes" -a x"${LANGTOOLS_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([cacao-checksum],
+	      [AS_HELP_STRING(--with-cacao-checksum,checksum the specified CACAO tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_CACAO_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_CACAO_CHECKSUM=yes
-        ;;
-    esac
+    CACAO_CHECKSUM=${withval}
   ],
   [
-    ENABLE_CACAO_CHECKSUM="yes"
+    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_RESULT(${CACAO_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_CACAO_CHECKSUM, test x"${CACAO_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_CACAO_CHECKSUM, test x"${CACAO_CHECKSUM}" != "xyes" -a x"${CACAO_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([jamvm-checksum],
+	      [AS_HELP_STRING(--with-jamvm-checksum,checksum the specified JamVM tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_JAMVM_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_JAMVM_CHECKSUM=yes
-        ;;
-    esac
+    JAMVM_CHECKSUM=${withval}
   ],
   [
-    ENABLE_JAMVM_CHECKSUM="yes"
+    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_RESULT(${JAMVM_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_JAMVM_CHECKSUM, test x"${JAMVM_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_JAMVM_CHECKSUM, test x"${JAMVM_CHECKSUM}" != "xyes" -a x"${JAMVM_CHECKSUM}" != "xno")
+  AC_SUBST(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]])],
+  AC_ARG_WITH([hotspot-checksum],
+	      [AS_HELP_STRING(--with-hotspot-checksum,checksum the specified HotSpot tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_HOTSPOT_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_HOTSPOT_CHECKSUM=yes
-        ;;
-    esac
+    HOTSPOT_CHECKSUM=${withval}
   ],
   [
-    ENABLE_HOTSPOT_CHECKSUM="yes"
+    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_RESULT(${HOTSPOT_CHECKSUM})
+  if test "x${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)
+  AM_CONDITIONAL(DISABLE_HOTSPOT_CHECKSUM, test x"${HOTSPOT_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_HOTSPOT_CHECKSUM, test x"${HOTSPOT_CHECKSUM}" != "xyes" -a x"${HOTSPOT_CHECKSUM}" != "xno")
+  AC_SUBST(HOTSPOT_CHECKSUM)
 ])
 
 AC_DEFUN_ONCE([IT_WITH_CACERTS_FILE],
@@ -2301,27 +2247,21 @@
 [
   AC_REQUIRE([IT_WITH_NASHORN_SRC_ZIP])
   AC_MSG_CHECKING([whether to enable checksumming of the specified Nashorn tarball])
-  AC_ARG_ENABLE([nashorn-checksum],
-	      [AS_HELP_STRING(--disable-nashorn-checksum,checksum the specified Nashorn tarball [[default=yes]])],
+  AC_ARG_WITH([nashorn-checksum],
+	      [AS_HELP_STRING(--with-nashorn-checksum,checksum the specified Nashorn tarball [[default=yes]])],
   [
-    case "${enableval}" in
-      no)
-	ENABLE_NASHORN_CHECKSUM=no
-        ;;
-      *)
-        ENABLE_NASHORN_CHECKSUM=yes
-        ;;
-    esac
+    NASHORN_CHECKSUM=${withval}
   ],
   [
-    ENABLE_NASHORN_CHECKSUM="yes"
+    NASHORN_CHECKSUM="yes"
   ])
-  AC_MSG_RESULT(${ENABLE_NASHORN_CHECKSUM})
-  if test "x${ENABLE_NASHORN_CHECKSUM}" = "xno" -a "x${ALT_NASHORN_SRC_ZIP}" = "xnot specified"; then
+  AC_MSG_RESULT(${NASHORN_CHECKSUM})
+  if test "x${NASHORN_CHECKSUM}" = "xno" -a "x${ALT_NASHORN_SRC_ZIP}" = "xnot specified"; then
     AC_MSG_WARN([No Nashorn source tarball specified; downloaded tarballs are always checksummed.])
   fi
-  AM_CONDITIONAL(DISABLE_NASHORN_CHECKSUM, test x"${ENABLE_NASHORN_CHECKSUM}" = "xno")
-  AC_SUBST(ENABLE_NASHORN_CHECKSUM)
+  AM_CONDITIONAL(DISABLE_NASHORN_CHECKSUM, test x"${NASHORN_CHECKSUM}" = "xno")
+  AM_CONDITIONAL(WITH_NASHORN_CHECKSUM, test x"${NASHORN_CHECKSUM}" != "xyes" -a x"${NASHORN_CHECKSUM}" != "xno")
+  AC_SUBST(NASHORN_CHECKSUM)
 ])
 
 AC_DEFUN_ONCE([IT_ENABLE_NON_NSS_CURVES],