--- a/ChangeLog	Thu Apr 07 03:25:35 2016 +0100
+++ b/ChangeLog	Thu Apr 07 03:55:41 2016 +0100
@@ -1,3 +1,12 @@
+2016-04-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
+
+	PR2917: Don't pass --with-cacerts-file to
+	build if USE_ALT_CACERTS_FILE is not set
+	* Makefile.am:
+	(ICEDTEA_CONFIGURE): Only pass --with-cacerts-file
+	if USE_ALT_CACERTS_FILE is set.
+	* NEWS: Updated.
+
 2016-04-06  Andrew John Hughes  <gnu_andrew@member.fsf.org>
 
 	PR2916: Update CACAO drop to use the latest

--- a/Makefile.am	Thu Apr 07 03:25:35 2016 +0100
+++ b/Makefile.am	Thu Apr 07 03:55:41 2016 +0100
@@ -411,7 +411,6 @@
 	  --build=$(build_triplet) \
 	  --host=$(host_triplet) \
 	  --enable-unlimited-crypto \
-	  --with-cacerts-file=$(CACERTS_FILE) \
 	  --with-stdc++lib=dynamic \
 	  --with-boot-jdk=$(BOOT_DIR) \
 	  --with-update-version=$(JDK_UPDATE_VERSION) \
@@ -497,6 +496,11 @@
 	--disable-warnings-as-errors
 endif
 
+if USE_ALT_CACERTS_FILE
+ICEDTEA_CONFIGURE += \
+	--with-cacerts-file=$(CACERTS_FILE)
+endif
+
 ICEDTEA_UNSET = \
 	JAVAC= \
 	JAVA_HOME= \

--- a/NEWS	Thu Apr 07 03:25:35 2016 +0100
+++ b/NEWS	Thu Apr 07 03:55:41 2016 +0100
@@ -161,6 +161,7 @@
   - PR2885: Location of 'stap' executable is hard-coded
   - PR2906: Support prefixed variants of GNU tools used on *BSD systems
   - PR2907: Replace --with-abs-install-dir with usual --prefix
+  - PR2917: Don't pass --with-cacerts-file to build if USE_ALT_CACERTS_FILE is not set
   - Don't substitute 'j' for '-j' inside -I directives
   - Extend 8041658 to all files in the HotSpot build.
   - Remove jcheck