commit b74ab6e40d7b92c4c1d96964030d0d7907265bbe
author cristy <urban-warrior@git.imagemagick.org> Sat Jun 06 12:39:54 2015 +0000
committer cristy <urban-warrior@git.imagemagick.org> Sat Jun 06 12:39:54 2015 +0000
tree 7574e1cce471d344bb1791f7d8b1369326809f50
parent 7a1d070b9e7d9c6ef04e3890bae4f4f47f7da9ed

MagickCore/profile.c

diff --git a/MagickCore/profile.c b/MagickCore/profile.c
index 45d5366..c23a879 100644
--- a/MagickCore/profile.c
+++ b/MagickCore/profile.c
@@ -67,7 +67,7 @@
 #include "MagickCore/token.h"
 #include "MagickCore/utility.h"
 #if defined(MAGICKCORE_LCMS_DELEGATE)
-#if defined(LCMS_VERSION) && (LCMS_VERSION < 2000)
+#if defined(MAGICKCORE_LCMS_VERSION_1)
 #include "lcms.h"
 #else
 #include <wchar.h>

MagickCore/property.c

diff --git a/MagickCore/property.c b/MagickCore/property.c
index b35aa03..fd7f653 100644
--- a/MagickCore/property.c
+++ b/MagickCore/property.c
@@ -85,7 +85,7 @@
 #include "MagickCore/xml-tree.h"
 #include "MagickCore/xml-tree-private.h"
 #if defined(MAGICKCORE_LCMS_DELEGATE)
-#if defined(LCMS_VERSION) && (LCMS_VERSION < 2000)
+#if defined(MAGICKCORE_LCMS_VERSION_1)
 #include "lcms.h"
 #else
 #include "lcms2.h"

configure

diff --git a/configure b/configure
index b104698..c6186c3 100755
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18729:18731M
+MAGICK_SVN_REVISION=18754M
 
 
 # Substitute library versioning
@@ -29114,6 +29114,8 @@
 
 $as_echo "#define FFTW_DELEGATE 1" >>confdefs.h
 
+  FFTW_CFLAGS="$fftw3_CFLAGS"
+  FFTW_LIBS="$fftw3_LIBS"
   CFLAGS="$fftw3_CFLAGS $CFLAGS"
 fi
 
@@ -30303,6 +30305,8 @@
 
 $as_echo "#define LCMS_DELEGATE 1" >>confdefs.h
 
+  LCMS_CFLAGS="$LCMS2_CFLAGS"
+  LCMS_LIBS="$LCMS2_LIBS"
   CFLAGS="$LCMS2_CFLAGS $CFLAGS"
 else
 
@@ -30380,6 +30384,9 @@
 
 $as_echo "#define LCMS_DELEGATE 1" >>confdefs.h
 
+
+$as_echo "#define LCMS_VERSION_1 1" >>confdefs.h
+
     CFLAGS="$LCMS_CFLAGS $CFLAGS"
   fi
 fi

configure.ac

diff --git a/configure.ac b/configure.ac
index a2d448a..6b9774f 100755
--- a/configure.ac
+++ b/configure.ac
@@ -1858,6 +1858,8 @@
 
 if test "$have_fftw" = 'yes'; then
   AC_DEFINE(FFTW_DELEGATE,1,Define if you have FFTW library)
+  FFTW_CFLAGS="$fftw3_CFLAGS"
+  FFTW_LIBS="$fftw3_LIBS"
   CFLAGS="$fftw3_CFLAGS $CFLAGS"
 fi
 
@@ -2263,11 +2265,14 @@
 
 if test "$have_lcms" = 'yes'; then
   AC_DEFINE(LCMS_DELEGATE,1,Define if you have LCMS library)
+  LCMS_CFLAGS="$LCMS2_CFLAGS"
+  LCMS_LIBS="$LCMS2_LIBS"
   CFLAGS="$LCMS2_CFLAGS $CFLAGS"
 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
 fi