changeset 2666:936f8f54db3a

Enable system LCMS only if 2.5 or above is available. 2013-07-24 Andrew John Hughes <gnu.andrew@member.fsf.org> * acinclude.m4: (IT_CHECK_FOR_LCMS): Turn system LCMS on by default if the version is 2.5 or above with the latest security fixes.
author Andrew John Hughes <gnu_andrew@member.fsf.org>
date Fri, 20 Sep 2013 14:13:18 +0100
parents 7008ba71f12f
children 41bf342bdb3e
files ChangeLog acinclude.m4
diffstat 2 files changed, 8 insertions(+), 1 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Fri Sep 20 14:08:53 2013 +0100
+++ b/ChangeLog	Fri Sep 20 14:13:18 2013 +0100
@@ -1,3 +1,10 @@
+2013-07-24  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	* acinclude.m4:
+	(IT_CHECK_FOR_LCMS): Turn system LCMS on by
+	default if the version is 2.5 or above with the
+	latest security fixes.
+
 2013-09-19  Andrew John Hughes  <gnu.andrew@member.fsf.org>
 
 	* Makefile.am:
--- a/acinclude.m4	Fri Sep 20 14:08:53 2013 +0100
+++ b/acinclude.m4	Fri Sep 20 14:13:18 2013 +0100
@@ -1947,7 +1947,7 @@
   AC_MSG_RESULT(${ENABLE_SYSTEM_LCMS})
   if test x"${ENABLE_SYSTEM_LCMS}" = "xyes"; then
     dnl Check for LCMS2 headers and libraries.
-    PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
+    PKG_CHECK_MODULES(LCMS2, lcms2 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
     then
       AC_MSG_ERROR([Could not find LCMS2; install LCMS2 or build with --disable-system-lcms to use the in-tree copy.])