Mercurial > hg > release > icedtea7-2.3
changeset 2672:b2d6bf00d0fc
Re-enable system LCMS is 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 back 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 | Thu, 25 Jul 2013 01:33:41 +0100 |
| parents | 197d1182abfd |
| children | 05dd3f8c99d9 |
| files | ChangeLog acinclude.m4 |
| diffstat | 2 files changed, 10 insertions(+), 4 deletions(-) [+] |
line wrap: on
line diff
--- a/ChangeLog Wed Jul 24 22:43:41 2013 +0100 +++ b/ChangeLog Thu Jul 25 01:33:41 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 back on by + default if the version is 2.5 or above with the + latest security fixes. + 2013-07-24 Andrew John Hughes <gnu.andrew@member.fsf.org> * Makefile.am:
--- a/acinclude.m4 Wed Jul 24 22:43:41 2013 +0100 +++ b/acinclude.m4 Thu Jul 25 01:33:41 2013 +0100 @@ -1908,18 +1908,17 @@ [ 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=no]])], + [AS_HELP_STRING(--enable-system-lcms,use the system LCMS [[default=yes]])], [ ENABLE_SYSTEM_LCMS="${enableval}" ], [ - ENABLE_SYSTEM_LCMS="no" + ENABLE_SYSTEM_LCMS="yes" ]) 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]) + 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.])