# HG changeset patch
# User Andrew John Hughes <gnu_andrew@member.fsf.org>
# Date 1372401006 18000
# Node ID ee8144fe33e6fb9c4e883a316808f858224528f3
# Parent  066d3181805f6e93871b96cdfcd9c065cdc585d9
Turn off system LCMS by default and warn if enabled, as it is unlikely to have the latest security updates.

2013-06-28  Andrew John Hughes  <gnu.andrew@member.fsf.org>

	* acinclude.m4:
	(IT_WITH_HOTSPOT_BUILD): Define once.
	(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
	and warn if enabled as it is unlikely to have
	the new security fixes.
	* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
	by IT_WITH_HOTSPOT_BUILD.

diff -r 066d3181805f -r ee8144fe33e6 ChangeLog
--- a/ChangeLog	Fri Jun 28 07:20:34 2013 +0100
+++ b/ChangeLog	Fri Jun 28 01:30:06 2013 -0500
@@ -1,3 +1,13 @@
+2013-06-28  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* acinclude.m4:
+	(IT_WITH_HOTSPOT_BUILD): Define once.
+	(IT_CHECK_FOR_LCMS): Turn system LCMS off by default
+	and warn if enabled as it is unlikely to have
+	the new security fixes.
+	* configure.ac: Drop IT_ENABLE_ZERO_BUILD; called
+	by IT_WITH_HOTSPOT_BUILD.
+
 2013-06-28  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Mention that 8001330 is not in Zero.
diff -r 066d3181805f -r ee8144fe33e6 acinclude.m4
--- a/acinclude.m4	Fri Jun 28 07:20:34 2013 +0100
+++ b/acinclude.m4	Fri Jun 28 01:30:06 2013 -0500
@@ -921,7 +921,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
 [
   AC_REQUIRE([IT_ENABLE_ZERO_BUILD])
   if test "x${use_zero}" = "xyes"; then
@@ -1912,15 +1912,16 @@
 [
   AC_MSG_CHECKING([whether to use the system LCMS install])
   AC_ARG_ENABLE([system-lcms],
-	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])],
+	      [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=no]])],
   [
     ENABLE_SYSTEM_LCMS="${enableval}"
   ],
   [
-    ENABLE_SYSTEM_LCMS="yes"
+    ENABLE_SYSTEM_LCMS="no"
   ])
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
+    AC_MSG_WARN([System LCMS may not have the latest security updates])
     dnl Check for LCMS2 headers and libraries.
     PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
diff -r 066d3181805f -r ee8144fe33e6 configure.ac
--- a/configure.ac	Fri Jun 28 07:20:34 2013 +0100
+++ b/configure.ac	Fri Jun 28 01:30:06 2013 -0500
@@ -180,7 +180,6 @@
 IT_ENABLE_WERROR
 IT_ENABLE_JAR_COMPRESSION
 IT_SET_SHARK_BUILD
-IT_ENABLE_ZERO_BUILD
 IT_CHECK_ADDITIONAL_VMS
 
 IT_WITH_VERSION_SUFFIX