diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 274 |
1 files changed, 168 insertions, 106 deletions
@@ -1,6 +1,6 @@ #! /bin/sh # Guess values for system-dependent variables and create Makefiles. -# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.10-46. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.10-57. # # Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>. # @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.10-46' -PACKAGE_STRING='ImageMagick 7.0.10-46' +PACKAGE_VERSION='7.0.10-57' +PACKAGE_STRING='ImageMagick 7.0.10-57' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://imagemagick.org' @@ -838,6 +838,9 @@ GVC_CFLAGS GS_LIBS GS_DELEGATE_FALSE GS_DELEGATE_TRUE +GDI32_LIBS +WINGDI32_DELEGATE_FALSE +WINGDI32_DELEGATE_TRUE RAQM_DELEGATE_FALSE RAQM_DELEGATE_TRUE RAQM_LIBS @@ -911,8 +914,8 @@ TCMALLOC_LIBS HAVE_TCMALLOC_FALSE HAVE_TCMALLOC_TRUE JEMALLOC_LIBS -HasJEMALLOC_FALSE -HasJEMALLOC_TRUE +HAVE_JEMALLOC_FALSE +HAVE_JEMALLOC_TRUE GOMP_LIBS WITH_MAGICK_PLUS_PLUS_FALSE WITH_MAGICK_PLUS_PLUS_TRUE @@ -975,17 +978,10 @@ pkgconfigdir SHAREARCH_DIR INCLUDEARCH_DIR WinPathScript -USING_CL_FALSE -USING_CL_TRUE CYGWIN_BUILD_FALSE CYGWIN_BUILD_TRUE WIN32_NATIVE_BUILD_FALSE WIN32_NATIVE_BUILD_TRUE -WINGDI32_DELEGATE_FALSE -WINGDI32_DELEGATE_TRUE -WS2_32_LIBS -OLE_LIBS -GDI32_LIBS HAVE_LD_VERSION_SCRIPT_FALSE HAVE_LD_VERSION_SCRIPT_TRUE PKG_CONFIG_LIBDIR @@ -1221,6 +1217,7 @@ with_djvu with_fontconfig with_freetype with_raqm +with_gdi32 with_gslib with_fontpath with_gs_font_dir @@ -1852,7 +1849,7 @@ if test "$ac_init_help" = "long"; then # Omit some internal or obsolete options to make the list less imposing. # This message is too long to be a string in the A/UX 3.1 sh. cat <<_ACEOF -\`configure' configures ImageMagick 7.0.10-46 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.10-57 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1927,7 +1924,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.10-46:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.10-57:";; esac cat <<\_ACEOF @@ -2040,6 +2037,7 @@ Optional Packages: --without-fontconfig disable fontconfig support --without-freetype disable Freetype support --without-raqm disable Raqm support + --without-gdi32 disable Windows gdi32 support --with-gslib enable Ghostscript library support --with-fontpath=DIR prepend to default font search path --with-gs-font-dir=DIR Ghostscript font directory @@ -2047,7 +2045,7 @@ Optional Packages: --without-heic disable HEIC support --without-jbig disable JBIG support --without-jpeg disable JPEG support - --without-jxl disable Jpegxl support + --without-jxl disable JPEG-XL support --without-lcms disable lcms (v1.1X) support --without-openjp2 disable OpenJP2 support --without-lqr disable Liquid Rescale support @@ -2225,7 +2223,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.10-46 +ImageMagick configure 7.0.10-57 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3276,7 +3274,7 @@ cat >config.log <<_ACEOF This file contains any messages produced by compilers while running configure, to aid debugging if configure makes a mistake. -It was created by ImageMagick $as_me 7.0.10-46, which was +It was created by ImageMagick $as_me 7.0.10-57, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -4262,7 +4260,7 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.10-46' + VERSION='7.0.10-57' cat >>confdefs.h <<_ACEOF @@ -4572,11 +4570,11 @@ MAGICK_MINOR_VERSION=0 MAGICK_MICRO_VERSION=10 -MAGICK_PATCHLEVEL_VERSION=46 +MAGICK_PATCHLEVEL_VERSION=57 -MAGICK_VERSION=7.0.10-46 +MAGICK_VERSION=7.0.10-57 -MAGICK_GIT_REVISION=17973:4660af18c:20201130 +MAGICK_GIT_REVISION=18193:4633fa369:20210105 # Substitute library versioning @@ -9084,38 +9082,16 @@ fi -GDI32_LIBS='' -WS2_32_LIBS='' native_win32_build='no' cygwin_build='no' case "${host_os}" in cygwin* ) cygwin_build='yes' - GDI32_LIBS='-lgdi32' ;; mingw* ) native_win32_build='yes' - GDI32_LIBS='-lgdi32' - OLE_LIBS='-loleaut32' - WS2_32_LIBS="-lws2_32" ;; esac -if test "${GDI32_LIBS}x" != 'x'; then - -$as_echo "#define WINGDI32_DELEGATE 1" >>confdefs.h - -fi - - - - if test "${GDI32_LIBS}x" != 'x' ; then - WINGDI32_DELEGATE_TRUE= - WINGDI32_DELEGATE_FALSE='#' -else - WINGDI32_DELEGATE_TRUE='#' - WINGDI32_DELEGATE_FALSE= -fi - if test "${native_win32_build}" = 'yes' ; then WIN32_NATIVE_BUILD_TRUE= WIN32_NATIVE_BUILD_FALSE='#' @@ -9132,14 +9108,6 @@ else CYGWIN_BUILD_FALSE= fi - if test "x${CC}" = 'xcl.exe' ; then - USING_CL_TRUE= - USING_CL_FALSE='#' -else - USING_CL_TRUE='#' - USING_CL_FALSE= -fi - WinPathScript="${srcdirfull}/winpath.sh" @@ -26688,7 +26656,7 @@ $as_echo "no -- some components failed test" >&6; } JEMALLOC_LIBS='-ljemalloc' LIBS="$JEMALLOC_LIBS $LIBS" -$as_echo "#define HasJEMALLOC 1" >>confdefs.h +$as_echo "#define HAVE_JEMALLOC 1" >>confdefs.h { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -26700,11 +26668,11 @@ $as_echo "no" >&6; } fi fi if test "$have_jemalloc" = 'yes'; then - HasJEMALLOC_TRUE= - HasJEMALLOC_FALSE='#' + HAVE_JEMALLOC_TRUE= + HAVE_JEMALLOC_FALSE='#' else - HasJEMALLOC_TRUE='#' - HasJEMALLOC_FALSE= + HAVE_JEMALLOC_TRUE='#' + HAVE_JEMALLOC_FALSE= fi @@ -29804,6 +29772,96 @@ fi # +# Enable Windows gdi32 libraries +# + +# Check whether --with-gdi32 was given. +if test "${with_gdi32+set}" = set; then : + withval=$with_gdi32; with_gdi32=$withval +else + with_gdi32='yes' +fi + +if test "$with_gdi32" != 'yes' ; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-gdi32=$with_gdi32 " +fi + +# +# Check for Windows gdi32 library. +# +have_gdi32='no' +if test "$with_gdi32" != 'no'; then + GDI32_LIBS='' + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for Windows GDI32 support" >&5 +$as_echo_n "checking for Windows GDI32 support... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 +$as_echo "" >&6; } + failed=0 + passed=0 + ac_fn_c_check_header_mongrel "$LINENO" "windows.h" "ac_cv_header_windows_h" "$ac_includes_default" +if test "x$ac_cv_header_windows_h" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + + ac_fn_c_check_header_compile "$LINENO" "winuser.h" "ac_cv_header_winuser_h" "#include <windows.h> +" +if test "x$ac_cv_header_winuser_h" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + + ac_fn_c_check_header_compile "$LINENO" "wingdi.h" "ac_cv_header_wingdi_h" "#include <windows.h> +" +if test "x$ac_cv_header_wingdi_h" = xyes; then : + passed=`expr $passed + 1` +else + failed=`expr $failed + 1` +fi + + + if test "$cygwin_build" = yes -o "$native_win32_build" = yes; then + passed=`expr $passed + 1` + fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if Windows GDI32 support is complete" >&5 +$as_echo_n "checking if Windows GDI32 support is complete... " >&6; } + if test $passed -gt 0; then + if test $failed -gt 0; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 +$as_echo "no -- some components failed test" >&6; } + have_gdi32='no (failed tests)' + else + GDI32_LIBS='-lgdi32 -luser32' + LIBS="$GDI32_LIBS $LIBS" + +$as_echo "#define WINGDI32_DELEGATE 1" >>confdefs.h + + { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 +$as_echo "yes" >&6; } + have_gdi32='yes' + fi + else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } + fi +fi + if test "$have_gdi32" = 'yes'; then + WINGDI32_DELEGATE_TRUE= + WINGDI32_DELEGATE_FALSE='#' +else + WINGDI32_DELEGATE_TRUE='#' + WINGDI32_DELEGATE_FALSE= +fi + + + + + +# # Check for Ghostscript library or framework. # # Test for iapi.h & test for gsapi_new_instance in -lgs @@ -30491,50 +30549,56 @@ fi if test "${with_jxl+set}" = set; then : withval=$with_jxl; with_jxl=$withval else - with_jxl='yes' + with_jxl='no' fi if test "$with_jxl" != 'yes'; then DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-jxl=$with_jxl " fi +if test "$enable_static" = 'yes'; then + if test "$with_utilities" = 'yes'; then + with_jxl='no' + fi +fi -# Check for the brunsli libraries, currently the only libraries used by the jxl coder. -# Full jxl support will be added once the full libraries are released. +# Check for the JPEG-XL library. have_jxl='no' JXL_LIBS='' if test "$with_jxl" != 'no'; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for brunsli" >&5 -$as_echo_n "checking for brunsli... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for jpeg-xl" >&5 +$as_echo_n "checking for jpeg-xl... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } failed=0 passed=0 - ac_fn_c_check_header_mongrel "$LINENO" "brunsli/decode.h" "ac_cv_header_brunsli_decode_h" "$ac_includes_default" -if test "x$ac_cv_header_brunsli_decode_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "jxl/decode.h" "ac_cv_header_jxl_decode_h" "$ac_includes_default" +if test "x$ac_cv_header_jxl_decode_h" = xyes; then : passed=`expr $passed + 1` else failed=`expr $failed + 1` fi - ac_fn_c_check_header_mongrel "$LINENO" "brunsli/encode.h" "ac_cv_header_brunsli_encode_h" "$ac_includes_default" -if test "x$ac_cv_header_brunsli_encode_h" = xyes; then : + ac_fn_c_check_header_mongrel "$LINENO" "jxl/encode.h" "ac_cv_header_jxl_encode_h" "$ac_includes_default" +if test "x$ac_cv_header_jxl_encode_h" = xyes; then : passed=`expr $passed + 1` else failed=`expr $failed + 1` fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DecodeBrunsli in -lbrunslidec-c" >&5 -$as_echo_n "checking for DecodeBrunsli in -lbrunslidec-c... " >&6; } -if ${ac_cv_lib_brunslidec_c_DecodeBrunsli+:} false; then : + # This check should be changed once we have a .pc file for the JPEG-XL library. + if test "$enable_static" != 'yes'; then + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JxlDecoderCreate in -ljxl" >&5 +$as_echo_n "checking for JxlDecoderCreate in -ljxl... " >&6; } +if ${ac_cv_lib_jxl_JxlDecoderCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lbrunslidec-c $LIBS" +LIBS="-ljxl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30544,40 +30608,39 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char DecodeBrunsli (); +char JxlDecoderCreate (); int main () { -return DecodeBrunsli (); +return JxlDecoderCreate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_brunslidec_c_DecodeBrunsli=yes + ac_cv_lib_jxl_JxlDecoderCreate=yes else - ac_cv_lib_brunslidec_c_DecodeBrunsli=no + ac_cv_lib_jxl_JxlDecoderCreate=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_brunslidec_c_DecodeBrunsli" >&5 -$as_echo "$ac_cv_lib_brunslidec_c_DecodeBrunsli" >&6; } -if test "x$ac_cv_lib_brunslidec_c_DecodeBrunsli" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jxl_JxlDecoderCreate" >&5 +$as_echo "$ac_cv_lib_jxl_JxlDecoderCreate" >&6; } +if test "x$ac_cv_lib_jxl_JxlDecoderCreate" = xyes; then : passed=`expr $passed + 1` else failed=`expr $failed + 1` fi - - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for EncodeBrunsli in -lbrunslienc-c" >&5 -$as_echo_n "checking for EncodeBrunsli in -lbrunslienc-c... " >&6; } -if ${ac_cv_lib_brunslienc_c_EncodeBrunsli+:} false; then : + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for JxlEncoderCreate in -ljxl" >&5 +$as_echo_n "checking for JxlEncoderCreate in -ljxl... " >&6; } +if ${ac_cv_lib_jxl_JxlEncoderCreate+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS -LIBS="-lbrunslienc-c $LIBS" +LIBS="-ljxl $LIBS" cat confdefs.h - <<_ACEOF >conftest.$ac_ext /* end confdefs.h. */ @@ -30587,42 +30650,43 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char EncodeBrunsli (); +char JxlEncoderCreate (); int main () { -return EncodeBrunsli (); +return JxlEncoderCreate (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_brunslienc_c_EncodeBrunsli=yes + ac_cv_lib_jxl_JxlEncoderCreate=yes else - ac_cv_lib_brunslienc_c_EncodeBrunsli=no + ac_cv_lib_jxl_JxlEncoderCreate=no fi rm -f core conftest.err conftest.$ac_objext \ conftest$ac_exeext conftest.$ac_ext LIBS=$ac_check_lib_save_LIBS fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_brunslienc_c_EncodeBrunsli" >&5 -$as_echo "$ac_cv_lib_brunslienc_c_EncodeBrunsli" >&6; } -if test "x$ac_cv_lib_brunslienc_c_EncodeBrunsli" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jxl_JxlEncoderCreate" >&5 +$as_echo "$ac_cv_lib_jxl_JxlEncoderCreate" >&6; } +if test "x$ac_cv_lib_jxl_JxlEncoderCreate" = xyes; then : passed=`expr $passed + 1` else failed=`expr $failed + 1` fi + fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if brunsli package is complete" >&5 -$as_echo_n "checking if brunsli package is complete... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jpeg-xl package is complete" >&5 +$as_echo_n "checking if jpeg-xl package is complete... " >&6; } if test $passed -gt 0; then if test $failed -gt 0; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no -- some components failed test" >&5 $as_echo "no -- some components failed test" >&6; } have_jxl='no (failed tests)' else - JXL_LIBS='-lbrunslidec-c -lbrunslienc-c' + JXL_LIBS='-ljxl' LIBS="$JXL_LIBS $LIBS" $as_echo "#define JXL_DELEGATE 1" >>confdefs.h @@ -35787,9 +35851,9 @@ fi # if test "$build_modules" != 'no'; then - MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZIPLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $LCMS_LIBS $FREETYPE_LIBS $RAQM_LIBS $LQR_LIBS $FFTW_LIBS $XML_LIBS $FLIF_LIBS $FONTCONFIG_LIBS $XEXT_LIBS $IPC_LIBS $X11_LIBS $XT_LIBS $LZMA_LIBS $BZLIB_LIBS $ZLIB_LIBS $ZIPLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS" else - MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS $WEBPMUX_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 $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $WS2_32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS" + MAGICK_DEP_LIBS="$USER_LIBS $JBIG_LIBS $LCMS_LIBS $TIFF_LIBS $FREETYPE_LIBS $RAQM_LIBS $JPEG_LIBS $JXL_LIBS $GS_LIBS $LQR_LIBS $PNG_LIBS $AUTOTRACE_LIBS $DJVU_LIBS $FFTW_LIBS $FLIF_LIBS $FPX_LIBS $FONTCONFIG_LIBS $HEIF_LIBS $WEBPMUX_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 $RAW_R_LIBS $RSVG_LIBS $XML_LIBS $GVC_LIBS $ZLIB_LIBS $ZLIB_LIBS $ZSTD_LIBS $LTDL_LIBS $GDI32_LIBS $MATH_LIBS $CL_LIBS $UMEM_LIBS $JEMALLOC_LIBS $THREAD_LIBS $TCMALLOC_LIBS" fi MAGICK_EXTRA_DEP_LIBS="$GOMP_LIBS" @@ -36014,10 +36078,6 @@ if test -z "${HAVE_LD_VERSION_SCRIPT_TRUE}" && test -z "${HAVE_LD_VERSION_SCRIPT as_fn_error $? "conditional \"HAVE_LD_VERSION_SCRIPT\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${WINGDI32_DELEGATE_TRUE}" && test -z "${WINGDI32_DELEGATE_FALSE}"; then - as_fn_error $? "conditional \"WINGDI32_DELEGATE\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${WIN32_NATIVE_BUILD_TRUE}" && test -z "${WIN32_NATIVE_BUILD_FALSE}"; then as_fn_error $? "conditional \"WIN32_NATIVE_BUILD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -36026,10 +36086,6 @@ if test -z "${CYGWIN_BUILD_TRUE}" && test -z "${CYGWIN_BUILD_FALSE}"; then as_fn_error $? "conditional \"CYGWIN_BUILD\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${USING_CL_TRUE}" && test -z "${USING_CL_FALSE}"; then - as_fn_error $? "conditional \"USING_CL\" was never defined. -Usually this means the macro was only invoked conditionally." "$LINENO" 5 -fi if test -z "${am__fastdepCXX_TRUE}" && test -z "${am__fastdepCXX_FALSE}"; then as_fn_error $? "conditional \"am__fastdepCXX\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -36067,8 +36123,8 @@ if test -z "${WITH_MAGICK_PLUS_PLUS_TRUE}" && test -z "${WITH_MAGICK_PLUS_PLUS_F as_fn_error $? "conditional \"WITH_MAGICK_PLUS_PLUS\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${HasJEMALLOC_TRUE}" && test -z "${HasJEMALLOC_FALSE}"; then - as_fn_error $? "conditional \"HasJEMALLOC\" was never defined. +if test -z "${HAVE_JEMALLOC_TRUE}" && test -z "${HAVE_JEMALLOC_FALSE}"; then + as_fn_error $? "conditional \"HAVE_JEMALLOC\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${HAVE_TCMALLOC_TRUE}" && test -z "${HAVE_TCMALLOC_FALSE}"; then @@ -36135,6 +36191,10 @@ if test -z "${RAQM_DELEGATE_TRUE}" && test -z "${RAQM_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"RAQM_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi +if test -z "${WINGDI32_DELEGATE_TRUE}" && test -z "${WINGDI32_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"WINGDI32_DELEGATE\" was never defined. +Usually this means the macro was only invoked conditionally." "$LINENO" 5 +fi if test -z "${GS_DELEGATE_TRUE}" && test -z "${GS_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"GS_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 @@ -36648,7 +36708,7 @@ cat >>$CONFIG_STATUS <<\_ACEOF || ac_write_fail=1 # report actual input values of CONFIG_FILES etc. instead of their # values after options handling. ac_log=" -This file was extended by ImageMagick $as_me 7.0.10-46, which was +This file was extended by ImageMagick $as_me 7.0.10-57, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -36715,7 +36775,7 @@ _ACEOF cat >>$CONFIG_STATUS <<_ACEOF || ac_write_fail=1 ac_cs_config="`$as_echo "$ac_configure_args" | sed 's/^ //; s/[\\""\`\$]/\\\\&/g'`" ac_cs_version="\\ -ImageMagick config.status 7.0.10-46 +ImageMagick config.status 7.0.10-57 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -38050,7 +38110,9 @@ $as_echo X/"$am_mf" | { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 $as_echo "$as_me: error: in \`$ac_pwd':" >&2;} as_fn_error $? "Something went wrong bootstrapping makefile fragments - for automatic dependency tracking. Try re-running configure with the + for automatic dependency tracking. If GNU make was not used, consider + re-running the configure script with MAKE=\"gmake\" (or whatever is + necessary). You can also try re-running configure with the '--disable-dependency-tracking' option to at least be able to build the package (albeit without support for automatic dependency tracking). See \`config.log' for more details" "$LINENO" 5; } |