(no commit message)

diff --git a/config/config.h.in b/config/config.h.in
index c8f9d503fdfa6f03aac5de9c91035dc0e5dd3bdf..cfd78bfcb785bc79637dfeaa4f94b52535a8a7a1 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -242,6 +242,18 @@
 /* Define to 1 if you have the `j1' function. */
 #undef HAVE_J1
 
+/* Define if you have the <lcms2.h> header file. */
+#undef HAVE_LCMS2_H
+
+/* Define if you have the <lcms2/lcms2.h> header file. */
+#undef HAVE_LCMS2_LCMS2_H
+
+/* Define if you have the <lcms.h> header file. */
+#undef HAVE_LCMS_H
+
+/* Define if you have the <lcms/lcms.h> header file. */
+#undef HAVE_LCMS_LCMS_H
+
 /* Define to 1 if you have the `gcov' library (-lgcov). */
 #undef HAVE_LIBGCOV
 
@@ -727,6 +739,9 @@
 /* Define if you have LCMS library */
 #undef LCMS_DELEGATE
 
+/* Define if you have LCMS version 1 library */
+#undef LCMS_VERSION_1
+
 /* Define if you have OPENJP2 library */
 #undef LIBOPENJP2_DELEGATE
 

diff --git a/configure b/configure
index 3bcbd6759eee4fa5d725f37580a509d594089823..0477a727862beb22a1953afebcd465751d1d5142 100755 (executable)
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18759:18761M
+MAGICK_SVN_REVISION=18759:18763M
 
 
 # Substitute library versioning
@@ -30318,6 +30318,10 @@ fi
 
 $as_echo "#define HAVE_LCMS2_LCMS2_H 1" >>confdefs.h
 
+  else
+
+$as_echo "#define HAVE_LCMS2_H 1" >>confdefs.h
+
   fi
 else
 
@@ -30409,6 +30413,10 @@ fi
 
 $as_echo "#define HAVE_LCMS_LCMS_H 1" >>confdefs.h
 
+    else
+
+$as_echo "#define HAVE_LCMS_H 1" >>confdefs.h
+
     fi
 fi
 
@@ -35673,9 +35681,9 @@ fi
 #
 
 if test "$build_modules" != 'no'; then
-    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $LCMS2_LIBS $FREETYPE_LIBS $LQR_LIBS $fftw3_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
 else
-    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $LCMS2_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DDJVUAP_LIBS $fftw3_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DDJVUAP_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
 fi
 
 
@@ -38788,7 +38796,7 @@ matches your expectations.
   DPS               --with-dps=$with_dps               $have_dps
   FFTW              --with-fftw=$with_fftw             $have_fftw
   FlashPIX          --with-fpx=$with_fpx               $have_fpx
-  FontConfig        --with-fontconfig=$with_fontconfig         $have_fontconfig
+  FontConfig        --with-fontconfig=$with_fontconfig $have_fontconfig
   FreeType          --with-freetype=$with_freetype             $have_freetype
   Ghostscript lib   --with-gslib=$with_gslib           $have_gslib
   Graphviz          --with-gvc=$with_gvc               $have_gvc
@@ -38874,7 +38882,7 @@ matches your expectations.
   DPS               --with-dps=$with_dps               $have_dps
   FFTW              --with-fftw=$with_fftw             $have_fftw
   FlashPIX          --with-fpx=$with_fpx               $have_fpx
-  FontConfig        --with-fontconfig=$with_fontconfig         $have_fontconfig
+  FontConfig        --with-fontconfig=$with_fontconfig $have_fontconfig
   FreeType          --with-freetype=$with_freetype             $have_freetype
   Ghostscript lib   --with-gslib=$with_gslib           $have_gslib
   Graphviz          --with-gvc=$with_gvc               $have_gvc

diff --git a/configure.ac b/configure.ac
index 0c1c5f5208dcce5a3825704469863e100b8fe39e..8d60c5c0229841d58a6103d040e8c5d9647e7cc1 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2271,6 +2271,8 @@ if test "$have_lcms" = 'yes'; then
   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.)
+  else
+    AC_DEFINE(HAVE_LCMS2_H,1,Define if you have the <lcms2.h> header file.)
   fi
 else
   PKG_CHECK_MODULES(LCMS,[lcms >= 1.0.0], have_lcms=yes, have_lcms=no)
@@ -2281,6 +2283,8 @@ else
     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.)
+    else
+      AC_DEFINE(HAVE_LCMS_H,1,Define if you have the <lcms.h> header file.)
     fi
 fi
 
@@ -3695,9 +3699,9 @@ fi
 #
 
 if test "$build_modules" != 'no'; then
-    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $LCMS2_LIBS $FREETYPE_LIBS $LQR_LIBS $fftw3_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+    MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $LQR_LIBS $FFTW_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
 else
-    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $LCMS2_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DDJVUAP_LIBS $fftw3_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
+    MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $JPEG_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DDJVUAP_LIBS $FFTW_LIBS $FPX_LIBS $FONTCONFIG_LIBS $WEBP_LIBS $WMF_LIBS $DPS_LIBS $XEXT_LIBS $XT_LIBS $IPC_LIBS $X11_LIBS $LZMA_LIBS $BZLIB_LIBS $OPENEXR_LIBS $LIBOPENJP2_LIBS $PANGO_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $GDI32_LIBS $MATH_LIBS $GOMP_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS"
 fi
 AC_SUBST(MAGICK_DEP_LIBS)
 
@@ -3856,7 +3860,7 @@ matches your expectations.
   DPS               --with-dps=$with_dps               $have_dps
   FFTW              --with-fftw=$with_fftw             $have_fftw
   FlashPIX          --with-fpx=$with_fpx               $have_fpx
-  FontConfig        --with-fontconfig=$with_fontconfig         $have_fontconfig
+  FontConfig        --with-fontconfig=$with_fontconfig $have_fontconfig
   FreeType          --with-freetype=$with_freetype             $have_freetype
   Ghostscript lib   --with-gslib=$with_gslib           $have_gslib
   Graphviz          --with-gvc=$with_gvc               $have_gvc