changeset 2570:a3780f9b9d89

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.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Sun, 30 Jun 2013 00:53:37 +0100
parents 7e0b337628c1
children 07eebe149062
files ChangeLog acinclude.m4
diffstat 2 files changed, 12 insertions(+), 3 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Jun 28 06:45:21 2013 +0100
+++ b/ChangeLog	Sun Jun 30 00:53:37 2013 +0100
@@ -1,3 +1,11 @@
+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.
+
 2013-06-25  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* NEWS: Add Red Hat bugzilla references.
--- a/acinclude.m4	Fri Jun 28 06:45:21 2013 +0100
+++ b/acinclude.m4	Sun Jun 30 00:53:37 2013 +0100
@@ -928,7 +928,7 @@
   AC_SUBST([GCJ])
 ])
 
-AC_DEFUN([IT_WITH_HOTSPOT_BUILD],
+AC_DEFUN_ONCE([IT_WITH_HOTSPOT_BUILD],
 [
   DEFAULT_BUILD="default"
   AC_MSG_CHECKING([which HotSpot build to use])
@@ -1873,15 +1873,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