diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index c23a879..dc1d92e 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -67,11 +67,16 @@
#include "MagickCore/token.h"
#include "MagickCore/utility.h"
#if defined(MAGICKCORE_LCMS_DELEGATE)
-#if defined(MAGICKCORE_LCMS_VERSION_1)
-#include "lcms.h"
-#else
+#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
+#include <wchar.h>
+#include <lcms/lcms2.h>
+#elif defined(MAGICKCORE_HAVE_LCMS2_H)
#include <wchar.h>
#include "lcms2.h"
+#elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H)
+#include <lcms/lcms.h>
+#else
+#include "lcms.h"
#endif
#endif
diff --git a/MagickCore/property.c b/MagickCore/property.c
index fd7f653..259f209 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -85,10 +85,14 @@
#include "MagickCore/xml-tree.h"
#include "MagickCore/xml-tree-private.h"
#if defined(MAGICKCORE_LCMS_DELEGATE)
-#if defined(MAGICKCORE_LCMS_VERSION_1)
-#include "lcms.h"
-#else
+#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H)
+#include <lcms/lcms2.h>
+#elif defined(MAGICKCORE_HAVE_LCMS2_H)
#include "lcms2.h"
+#elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H)
+#include <lcms/lcms.h>
+#else
+#include "lcms.h"
#endif
#endif
diff --git a/configure b/configure
index c6186c3..3bcbd67 100755
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=18754M
+MAGICK_SVN_REVISION=18759:18761M
# Substitute library versioning
@@ -30308,6 +30308,17 @@
LCMS_CFLAGS="$LCMS2_CFLAGS"
LCMS_LIBS="$LCMS2_LIBS"
CFLAGS="$LCMS2_CFLAGS $CFLAGS"
+ ac_fn_c_check_header_mongrel "$LINENO" "lcms2/lcms2.h" "ac_cv_header_lcms2_lcms2_h" "$ac_includes_default"
+if test "x$ac_cv_header_lcms2_lcms2_h" = xyes; then :
+ have_lcms_header='yes'
+fi
+
+
+ if test "$have_lcms_header" = 'yes'; then
+
+$as_echo "#define HAVE_LCMS2_LCMS2_H 1" >>confdefs.h
+
+ fi
else
pkg_failed=no
@@ -30388,7 +30399,17 @@
$as_echo "#define LCMS_VERSION_1 1" >>confdefs.h
CFLAGS="$LCMS_CFLAGS $CFLAGS"
- fi
+ ac_fn_c_check_header_mongrel "$LINENO" "lcms/lcms.h" "ac_cv_header_lcms_lcms_h" "$ac_includes_default"
+if test "x$ac_cv_header_lcms_lcms_h" = xyes; then :
+ have_lcms_header='yes'
+fi
+
+
+ if test "$have_lcms_header" = 'yes'; then
+
+$as_echo "#define HAVE_LCMS_LCMS_H 1" >>confdefs.h
+
+ fi
fi
if test "$have_lcms" = 'yes'; then
@@ -38774,8 +38795,7 @@
JBIG --with-jbig=$with_jbig $have_jbig
JPEG v1 --with-jpeg=$with_jpeg $have_jpeg
JPEG-2000 --with-jp2=$with_jp2 $have_jp2
- LCMS v1 --with-lcms=$with_lcms $have_lcms
- LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
+ LCMS --with-lcms=$with_lcms $have_lcms
LIBJPEG2 --with-openjp2=$with_openjp2 $have_openjp2
LQR --with-lqr=$with_lqr $have_lqr
LTDL --with-ltdl=$with_ltdl $have_ltdl
@@ -38861,8 +38881,7 @@
JBIG --with-jbig=$with_jbig $have_jbig
JPEG v1 --with-jpeg=$with_jpeg $have_jpeg
JPEG-2000 --with-jp2=$with_jp2 $have_jp2
- LCMS v1 --with-lcms=$with_lcms $have_lcms
- LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
+ LCMS --with-lcms=$with_lcms $have_lcms
LIBJPEG2 --with-openjp2=$with_openjp2 $have_openjp2
LQR --with-lqr=$with_lqr $have_lqr
LTDL --with-ltdl=$with_ltdl $have_ltdl
diff --git a/configure.ac b/configure.ac
index 43732de..0c1c5f5 100755
--- a/configure.ac
+++ b/configure.ac
@@ -2268,13 +2268,20 @@
LCMS_CFLAGS="$LCMS2_CFLAGS"
LCMS_LIBS="$LCMS2_LIBS"
CFLAGS="$LCMS2_CFLAGS $CFLAGS"
+ AC_CHECK_HEADER(lcms2/lcms2.h,have_lcms_header='yes',,)
+ if test "$have_lcms_header" = 'yes'; then
+ AC_DEFINE(HAVE_LCMS2_LCMS2_H,1,Define if you have the <lcms2/lcms2.h> header file.)
+ fi
else
PKG_CHECK_MODULES(LCMS,[lcms >= 1.0.0], have_lcms=yes, have_lcms=no)
if test "$have_lcms" = 'yes'; then
AC_DEFINE(LCMS_DELEGATE,1,Define if you have LCMS library)
AC_DEFINE(LCMS_VERSION_1,1,Define if you have LCMS version 1 library)
CFLAGS="$LCMS_CFLAGS $CFLAGS"
- fi
+ AC_CHECK_HEADER(lcms/lcms.h,have_lcms_header='yes',,)
+ if test "$have_lcms_header" = 'yes'; then
+ AC_DEFINE(HAVE_LCMS_LCMS_H,1,Define if you have the <lcms/lcms.h> header file.)
+ fi
fi
AM_CONDITIONAL(LCMS_DELEGATE, test "$have_lcms" = 'yes')
@@ -3856,8 +3863,7 @@
JBIG --with-jbig=$with_jbig $have_jbig
JPEG v1 --with-jpeg=$with_jpeg $have_jpeg
JPEG-2000 --with-jp2=$with_jp2 $have_jp2
- LCMS v1 --with-lcms=$with_lcms $have_lcms
- LCMS v2 --with-lcms2=$with_lcms2 $have_lcms2
+ LCMS --with-lcms=$with_lcms $have_lcms
LIBJPEG2 --with-openjp2=$with_openjp2 $have_openjp2
LQR --with-lqr=$with_lqr $have_lqr
LTDL --with-ltdl=$with_ltdl $have_ltdl