Mercurial > hg > release > icedtea7-2.5
changeset 2723:a4953c31f1b7
PR1830: Drop version requirement for LCMS 2
2014-06-10 Andrew John Hughes <gnu.andrew@member.fsf.org>
PR1830: 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@member.fsf.org> |
|---|---|
| date | Wed, 11 Jun 2014 01:26:45 +0100 |
| parents | ddaa2991858e |
| children | 716f160592e2 |
| files | ChangeLog INSTALL NEWS acinclude.m4 |
| diffstat | 4 files changed, 12 insertions(+), 2 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jun 11 01:21:21 2014 +0100 +++ b/ChangeLog Wed Jun 11 01:26:45 2014 +0100 @@ -1,3 +1,11 @@ +2014-06-10 Andrew John Hughes <gnu.andrew@member.fsf.org> + + PR1830: Drop version requirement for LCMS 2 + * INSTALL: Document lcms2 requirement. + * NEWS: Updated. + * acinclude.m4: + (IT_CHECK_FOR_LCMS): Drop 2.5 requirement. + 2014-06-10 Andrew John Hughes <gnu.andrew@member.fsf.org> PR1827: Support AM_MAINTAINER_MODE
--- a/INSTALL Wed Jun 11 01:21:21 2014 +0100 +++ b/INSTALL Wed Jun 11 01:26:45 2014 +0100 @@ -27,6 +27,7 @@ libpng-devel (for --enable-system-png) libjpeg-devel >= 6b (for --enable-system-jpeg) zlib-devel (for --enable-system-zlib) +lcms2-devel (for --enable-system-lcms) fontconfig (for --enable-system-fontconfig) libc6-dev & libattr-devel/libattr1-dev (for --enable-compile-against-syscalls) libpcsclite (for --enable-system-pcsc)
--- a/NEWS Wed Jun 11 01:21:21 2014 +0100 +++ b/NEWS Wed Jun 11 01:26:45 2014 +0100 @@ -281,6 +281,7 @@ - PR1814: HotSpot URL should be used with --enable-hg - PR1371: Provide option to build without debugging - PR1827: Support AM_MAINTAINER_MODE + - PR1830: Drop version requirement for LCMS 2 * PPC & AIX port - Add AIX-specific build instructions to README-ppc.html - Added AIX as testing platform for more jtreg tests written in shell-script
--- a/acinclude.m4 Wed Jun 11 01:21:21 2014 +0100 +++ b/acinclude.m4 Wed Jun 11 01:26:45 2014 +0100 @@ -1945,10 +1945,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)