changeset 3167:be55ad609ddc

PR1831: Drop version requirement for LCMS 2 2014-06-10 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1831: Drop version requirement for LCMS 2 * INSTALL: Document lcms2 requirement. * NEWS: Updated. * acinclude.m4: (IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
author Andrew John Hughes <gnu.andrew@redhat.com>
date Tue, 20 Jan 2015 05:14:21 +0000
parents 199332d3ed53
children 92941f2c41f4
files ChangeLog INSTALL NEWS acinclude.m4
diffstat 4 files changed, 12 insertions(+), 2 deletions(-) [+]
line wrap: on
line diff
--- a/ChangeLog	Wed Nov 12 23:58:13 2014 +0000
+++ b/ChangeLog	Tue Jan 20 05:14:21 2015 +0000
@@ -1,3 +1,11 @@
+2014-06-10  Andrew John Hughes  <gnu.andrew@member.fsf.org>
+
+	PR1831: Drop version requirement for LCMS 2
+	* INSTALL: Document lcms2 requirement.
+	* NEWS: Updated.
+	* acinclude.m4:
+	(IT_CHECK_FOR_LCMS): Drop 2.5 requirement.
+
 2014-11-12  Andrew John Hughes  <gnu.andrew@redhat.com>
 
 	* Makefile.am:
--- a/INSTALL	Wed Nov 12 23:58:13 2014 +0000
+++ b/INSTALL	Tue Jan 20 05:14:21 2015 +0000
@@ -36,6 +36,7 @@
 pulseaudio-libs-devel >= 0.9.11 (for --enable-pulse-java)
 LLVM 2.5 or later (for --enable-shark)
 systemtap-sdl-devel >= 0.9.5 (for --enable-systemtap, Java method tracing requires systemtap >= 0.9.9)
+lcms2-devel (for --enable-lcms2 and --enable-system-lcms)
 
 See ./configure --help if you need to override the defaults.
 
--- a/NEWS	Wed Nov 12 23:58:13 2014 +0000
+++ b/NEWS	Tue Jan 20 05:14:21 2015 +0000
@@ -26,6 +26,7 @@
   - S8013057: Detect mmap() commit failures in Linux and Solaris os::commit_memory() impls and call vm_exit_out_of_memory()
   - S8026887: Make issues due to failed large pages allocations easier to debug
 * Bug fixes
+  - PR1831: Drop version requirement for LCMS 2
   - PR1886: IcedTea does not checksum supplied tarballs
   - PR2033: patches/ecj/jaxws-getdtdtype.patch no longer applies since removal of JAXWS drop
   - PR2083: Add support for building Zero on AArch64
--- a/acinclude.m4	Wed Nov 12 23:58:13 2014 +0000
+++ b/acinclude.m4	Tue Jan 20 05:14:21 2015 +0000
@@ -1554,10 +1554,10 @@
   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 >= 2.5,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
+    PKG_CHECK_MODULES(LCMS2, lcms2,[LCMS2_FOUND=yes],[LCMS2_FOUND=no])
     if test "x${LCMS2_FOUND}" = xno
     then
-      AC_MSG_ERROR([Could not find LCMS >= 2.5; install it or build with --disable-system-lcms to use the in-tree copy.])
+      AC_MSG_ERROR([Could not find LCMS 2; install it or build with --disable-system-lcms to use the in-tree copy.])
     fi
     AC_SUBST(LCMS2_CFLAGS)
     AC_SUBST(LCMS2_LIBS)