From b054e07f69b853019a922f77c03910a021f2195e Mon Sep 17 00:00:00 2001 From: cristy Date: Fri, 5 Jun 2015 20:35:43 +0000 Subject: [PATCH] --- MagickCore/profile.c | 11 ++--- MagickCore/property.c | 10 ++-- MagickCore/version.h | 2 +- Makefile.in | 2 + configure | 103 ++++++++++++++++++++++++++++++++++++++---- configure.ac | 14 ++++-- 6 files changed, 113 insertions(+), 29 deletions(-) diff --git a/MagickCore/profile.c b/MagickCore/profile.c index dc1d92e51..45d536674 100644 --- a/MagickCore/profile.c +++ b/MagickCore/profile.c @@ -67,16 +67,11 @@ #include "MagickCore/token.h" #include "MagickCore/utility.h" #if defined(MAGICKCORE_LCMS_DELEGATE) -#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H) -#include -#include -#elif defined(MAGICKCORE_HAVE_LCMS2_H) +#if defined(LCMS_VERSION) && (LCMS_VERSION < 2000) +#include "lcms.h" +#else #include #include "lcms2.h" -#elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H) -#include -#else -#include "lcms.h" #endif #endif diff --git a/MagickCore/property.c b/MagickCore/property.c index 259f20947..b35aa03ec 100644 --- a/MagickCore/property.c +++ b/MagickCore/property.c @@ -85,14 +85,10 @@ #include "MagickCore/xml-tree.h" #include "MagickCore/xml-tree-private.h" #if defined(MAGICKCORE_LCMS_DELEGATE) -#if defined(MAGICKCORE_HAVE_LCMS_LCMS2_H) -#include -#elif defined(MAGICKCORE_HAVE_LCMS2_H) -#include "lcms2.h" -#elif defined(MAGICKCORE_HAVE_LCMS_LCMS_H) -#include -#else +#if defined(LCMS_VERSION) && (LCMS_VERSION < 2000) #include "lcms.h" +#else +#include "lcms2.h" #endif #endif diff --git a/MagickCore/version.h b/MagickCore/version.h index 7444c88fb..98ffd4eb4 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2015 ImageMagick Studio LLC" -#define MagickSVNRevision "18729M" +#define MagickSVNRevision "18729:18731M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 0,0,0 diff --git a/Makefile.in b/Makefile.in index a6898d2ae..46f078ae4 100644 --- a/Makefile.in +++ b/Makefile.in @@ -2685,6 +2685,8 @@ JEMALLOC_LIBS = @JEMALLOC_LIBS@ JPEG_LIBS = @JPEG_LIBS@ JXRDecodeDelegate = @JXRDecodeDelegate@ JXREncodeDelegate = @JXREncodeDelegate@ +LCMS2_CFLAGS = @LCMS2_CFLAGS@ +LCMS2_LIBS = @LCMS2_LIBS@ LCMS_CFLAGS = @LCMS_CFLAGS@ LCMS_LIBS = @LCMS_LIBS@ LD = @LD@ diff --git a/configure b/configure index 23d2dda2c..b104698ac 100755 --- a/configure +++ b/configure @@ -815,6 +815,8 @@ LCMS_DELEGATE_FALSE LCMS_DELEGATE_TRUE LCMS_LIBS LCMS_CFLAGS +LCMS2_LIBS +LCMS2_CFLAGS JPEG_LIBS JPEG_DELEGATE_FALSE JPEG_DELEGATE_TRUE @@ -1247,6 +1249,8 @@ FREETYPE_CFLAGS FREETYPE_LIBS GVC_CFLAGS GVC_LIBS +LCMS2_CFLAGS +LCMS2_LIBS LCMS_CFLAGS LCMS_LIBS LIBOPENJP2_CFLAGS @@ -2049,6 +2053,9 @@ Some influential environment variables: linker flags for FREETYPE, overriding pkg-config GVC_CFLAGS C compiler flags for GVC, overriding pkg-config GVC_LIBS linker flags for GVC, overriding pkg-config + LCMS2_CFLAGS + C compiler flags for LCMS2, overriding pkg-config + LCMS2_LIBS linker flags for LCMS2, overriding pkg-config LCMS_CFLAGS C compiler flags for LCMS, overriding pkg-config LCMS_LIBS linker flags for LCMS, overriding pkg-config LIBOPENJP2_CFLAGS @@ -4380,7 +4387,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=18729M +MAGICK_SVN_REVISION=18729:18731M # Substitute library versioning @@ -30218,6 +30225,87 @@ if test "x$with_lcms" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } +pkg_failed=no +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS2" >&5 +$as_echo_n "checking for LCMS2... " >&6; } + +if test -n "$LCMS2_CFLAGS"; then + pkg_cv_LCMS2_CFLAGS="$LCMS2_CFLAGS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.0.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LCMS2_CFLAGS=`$PKG_CONFIG --cflags "lcms2 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi +if test -n "$LCMS2_LIBS"; then + pkg_cv_LCMS2_LIBS="$LCMS2_LIBS" + elif test -n "$PKG_CONFIG"; then + if test -n "$PKG_CONFIG" && \ + { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"lcms2 >= 2.0.0\""; } >&5 + ($PKG_CONFIG --exists --print-errors "lcms2 >= 2.0.0") 2>&5 + ac_status=$? + $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 + test $ac_status = 0; }; then + pkg_cv_LCMS2_LIBS=`$PKG_CONFIG --libs "lcms2 >= 2.0.0" 2>/dev/null` + test "x$?" != "x0" && pkg_failed=yes +else + pkg_failed=yes +fi + else + pkg_failed=untried +fi + + + +if test $pkg_failed = yes; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + +if $PKG_CONFIG --atleast-pkgconfig-version 0.20; then + _pkg_short_errors_supported=yes +else + _pkg_short_errors_supported=no +fi + if test $_pkg_short_errors_supported = yes; then + LCMS2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "lcms2 >= 2.0.0" 2>&1` + else + LCMS2_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "lcms2 >= 2.0.0" 2>&1` + fi + # Put the nasty error message in config.log where it belongs + echo "$LCMS2_PKG_ERRORS" >&5 + + have_lcms=no +elif test $pkg_failed = untried; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + have_lcms=no +else + LCMS2_CFLAGS=$pkg_cv_LCMS2_CFLAGS + LCMS2_LIBS=$pkg_cv_LCMS2_LIBS + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_lcms=yes +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } +fi + +if test "$have_lcms" = 'yes'; then + +$as_echo "#define LCMS_DELEGATE 1" >>confdefs.h + + CFLAGS="$LCMS2_CFLAGS $CFLAGS" +else + pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for LCMS" >&5 $as_echo_n "checking for LCMS... " >&6; } @@ -30288,15 +30376,12 @@ else $as_echo "yes" >&6; } have_lcms=yes fi - { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 -$as_echo "" >&6; } -fi - -if test "$have_lcms" = 'yes'; then + if test "$have_lcms" = 'yes'; then $as_echo "#define LCMS_DELEGATE 1" >>confdefs.h - CFLAGS="$LCMS_CFLAGS $CFLAGS" + CFLAGS="$LCMS_CFLAGS $CFLAGS" + fi fi if test "$have_lcms" = 'yes'; then @@ -35560,9 +35645,9 @@ fi # if test "$build_modules" != 'no'; then - MAGICK_DEP_LIBS="$USER_LIBS $LCMS_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 $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" else - 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 $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 $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" fi diff --git a/configure.ac b/configure.ac index 1d262f1f8..a2d448a59 100755 --- a/configure.ac +++ b/configure.ac @@ -2257,13 +2257,19 @@ LCMS_LIBS="" LCMS_PKG="" if test "x$with_lcms" = "xyes"; then AC_MSG_RESULT([-------------------------------------------------------------]) - PKG_CHECK_MODULES(LCMS,[lcms >= 1.0.0], have_lcms=yes, have_lcms=no) + PKG_CHECK_MODULES(LCMS2,[lcms2 >= 2.0.0], have_lcms=yes, have_lcms=no) AC_MSG_RESULT([]) fi if test "$have_lcms" = 'yes'; then AC_DEFINE(LCMS_DELEGATE,1,Define if you have LCMS library) - CFLAGS="$LCMS_CFLAGS $CFLAGS" + 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) + CFLAGS="$LCMS_CFLAGS $CFLAGS" + fi fi AM_CONDITIONAL(LCMS_DELEGATE, test "$have_lcms" = 'yes') @@ -3677,9 +3683,9 @@ fi # if test "$build_modules" != 'no'; then - MAGICK_DEP_LIBS="$USER_LIBS $LCMS_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 $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" else - 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 $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 $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" fi AC_SUBST(MAGICK_DEP_LIBS) -- 2.50.1