From 469840f81299d04bf9cd571d4ff1e6408822fa87 Mon Sep 17 00:00:00 2001 From: Sven Neumann Date: Tue, 25 Nov 2003 14:38:08 +0000 Subject: [PATCH] applied a patch from Adrian Bunk that changes the function to look for 2003-11-25 Sven Neumann * configure.in: applied a patch from Adrian Bunk that changes the function to look for when checking for lcms (bug #127893). Also added a warning when lcms is not found. --- ChangeLog | 6 ++++++ configure.in | 15 ++++++++++----- 2 files changed, 16 insertions(+), 5 deletions(-) diff --git a/ChangeLog b/ChangeLog index a421ffec6f..d945a39c74 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2003-11-25 Sven Neumann + + * configure.in: applied a patch from Adrian Bunk that changes the + function to look for when checking for lcms (bug #127893). Also + added a warning when lcms is not found. + 2003-11-25 Sven Neumann * plug-ins/bmp/bmp.[ch] diff --git a/configure.in b/configure.in index c34f423388..4527579db4 100644 --- a/configure.in +++ b/configure.in @@ -1041,17 +1041,22 @@ AC_SUBST(WMF_CFLAGS) ################ have_lcms=no -AC_CHECK_LIB(lcms, cmsCreateProofingTransform, [ +AC_CHECK_LIB(lcms, cmsCreate_sRGBProfile, [ AC_CHECK_HEADER(lcms.h, - have_lcms=yes - LCMS_LIBS="-llcms", [ + have_lcms=yes, [ AC_CHECK_HEADER(lcms/lcms.h, have_lcms=yes AC_DEFINE(HAVE_LCMS_LCMS_H, 1, - [Define to 1 if the lcms header must be included as lcms/lcms.h]) - LCMS_LIBS="-llcms")]) + [Define to 1 if the lcms header must be included as lcms/lcms.h])) + ]) ]) +if test $have_lcms = yes; then + LCMS_LIBS="-llcms" +else + AC_MSG_WARN([*** color proof module will not be built (lcms not found or unuseable) ***]) +fi + AC_SUBST(LCMS_LIBS) AM_CONDITIONAL(HAVE_LCMS, test $have_lcms = yes)