From bc8ef1cd93c1cfb72dce578167165c6986b5e88c Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 6 Jun 2015 14:32:21 +0000 Subject: [PATCH] --- config/config.h.in | 15 +++++++++++++++ configure | 18 +++++++++++++----- configure.ac | 10 +++++++--- 3 files changed, 35 insertions(+), 8 deletions(-) diff --git a/config/config.h.in b/config/config.h.in index c8f9d503f..cfd78bfcb 100644 --- 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 header file. */ +#undef HAVE_LCMS2_H + +/* Define if you have the header file. */ +#undef HAVE_LCMS2_LCMS2_H + +/* Define if you have the header file. */ +#undef HAVE_LCMS_H + +/* Define if you have the 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 3bcbd6759..0477a7278 100755 --- 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 0c1c5f520..8d60c5c02 100755 --- 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 header file.) + else + AC_DEFINE(HAVE_LCMS2_H,1,Define if you have the 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 header file.) + else + AC_DEFINE(HAVE_LCMS_H,1,Define if you have the 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 -- 2.40.0