diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 860 |
1 files changed, 548 insertions, 312 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-57. +# Generated by GNU Autoconf 2.69 for ImageMagick 7.0.11-8. # # Report bugs to <https://github.com/ImageMagick/ImageMagick/issues>. # @@ -274,11 +274,11 @@ fi $as_echo "$0: In particular, zsh $ZSH_VERSION has bugs and should" $as_echo "$0: be upgraded to zsh 4.3.4 or later." else - $as_echo "$0: Please tell bug-autoconf@gnu.org and -$0: https://github.com/ImageMagick/ImageMagick/issues about -$0: your system, including any error possibly output before -$0: this message. Then install a modern shell, or manually -$0: run the script under such a shell if you do have one." + $as_echo "$0: Please tell bug-autoconf@gnu.org and https://github.com/ImageMagick/ImageMagick/issues +$0: about your system, including any error possibly output +$0: before this message. Then install a modern shell, or +$0: manually run the script under such a shell if you do +$0: have one." fi exit 1 fi @@ -590,8 +590,8 @@ MAKEFLAGS= # Identity of this package. PACKAGE_NAME='ImageMagick' PACKAGE_TARNAME='ImageMagick' -PACKAGE_VERSION='7.0.10-57' -PACKAGE_STRING='ImageMagick 7.0.10-57' +PACKAGE_VERSION='7.0.11-8' +PACKAGE_STRING='ImageMagick 7.0.11-8' PACKAGE_BUGREPORT='https://github.com/ImageMagick/ImageMagick/issues' PACKAGE_URL='https://imagemagick.org' @@ -672,8 +672,6 @@ PCLVersion PCLCMYKDevice PCLColorDevice PCLMonoDevice -ZIP_DELEGATE_FALSE -ZIP_DELEGATE_TRUE ZIP P7ZIP_DELEGATE_FALSE P7ZIP_DELEGATE_TRUE @@ -890,10 +888,10 @@ ZLIB_DELEGATE_FALSE ZLIB_DELEGATE_TRUE ZLIB_LIBS ZLIB_CFLAGS -ZIPLIB_DELEGATE_FALSE -ZIPLIB_DELEGATE_TRUE -ZIPLIB_LIBS -ZIPLIB_CFLAGS +ZIP_DELEGATE_FALSE +ZIP_DELEGATE_TRUE +ZIP_LIBS +ZIP_CFLAGS XEXT_LIBS X11_LIBS X11_DELEGATE_FALSE @@ -959,7 +957,6 @@ LIPO NMEDIT DSYMUTIL MANIFEST_TOOL -RANLIB NM ac_ct_DUMPBIN DUMPBIN @@ -988,6 +985,7 @@ PKG_CONFIG_LIBDIR PKG_CONFIG_PATH PKG_CONFIG PRTDIAG +RANLIB LN_S LD FGREP @@ -1033,19 +1031,17 @@ SBIN_DIR BIN_DIR EXEC_PREFIX_DIR PREFIX_DIR -CONFIG_STATUS_DEPENDENCIES MAGICKPP_LIB_VERSION_TEXT MAGICKPP_LIB_VERSION MAGICK_LIB_VERSION_NUMBER MAGICK_LIB_VERSION_TEXT MAGICK_LIB_VERSION -PACKAGE_VERSION_ADDENDUM PACKAGE_RELEASE_DATE PACKAGE_LIB_VERSION_NUMBER PACKAGE_LIB_VERSION -PACKAGE_CHANGE_DATE -PACKAGE_RELEASE -PACKAGE_PERL_VERSION +PACKAGE_VERSION_ADDENDUM +PACKAGE_PATCHLEVEL_VERSION +PACKAGE_BASE_VERSION MAGICKPP_LIBRARY_VERSION_INFO MAGICKPP_LIBRARY_CURRENT_MIN MAGICKPP_LIBRARY_AGE @@ -1067,6 +1063,7 @@ MAGICK_TARGET_VENDOR MAGICK_TARGET_CPU CONFIGURE_ARGS DISTCHECK_CONFIG_FLAGS +CONFIGURE_DEPENDENCIES AM_BACKSLASH AM_DEFAULT_VERBOSITY AM_DEFAULT_V @@ -1149,7 +1146,6 @@ ac_subst_files='' ac_user_opts=' enable_option_checking enable_silent_rules -enable_reproducible_build enable_dependency_tracking with_gnu_ld with_dmalloc @@ -1203,7 +1199,7 @@ with_umem with_libstdc with_bzlib with_x -with_ziplib +with_zip with_zlib with_zstd with_apple_font_dir @@ -1261,8 +1257,8 @@ CXXFLAGS CCC CXXCPP XMKMF -ZIPLIB_CFLAGS -ZIPLIB_LIBS +ZIP_CFLAGS +ZIP_LIBS ZLIB_CFLAGS ZLIB_LIBS LIBZSTD_CFLAGS @@ -1849,7 +1845,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-57 to adapt to many kinds of systems. +\`configure' configures ImageMagick 7.0.11-8 to adapt to many kinds of systems. Usage: $0 [OPTION]... [VAR=VALUE]... @@ -1924,7 +1920,7 @@ fi if test -n "$ac_init_help"; then case $ac_init_help in - short | recursive ) echo "Configuration of ImageMagick 7.0.10-57:";; + short | recursive ) echo "Configuration of ImageMagick 7.0.11-8:";; esac cat <<\_ACEOF @@ -1934,8 +1930,6 @@ Optional Features: --enable-FEATURE[=ARG] include FEATURE [ARG=yes] --enable-silent-rules less verbose build output (undo: "make V=1") --disable-silent-rules verbose build output (undo: "make V=0") - --enable-reproducible-build - enable reproducible build --enable-dependency-tracking do not reject slow dependency extractors --disable-dependency-tracking @@ -1948,7 +1942,7 @@ Optional Features: --enable-osx-universal-binary build universal binary on OS X [[default=no]] --disable-openmp do not use OpenMP - --disable-opencl do not use OpenCL + --enable-opencl use OpenCL --disable-largefile omit support for large files --enable-shared[=PKGS] build shared libraries [default=yes] --enable-static[=PKGS] build static libraries [default=yes] @@ -2021,7 +2015,7 @@ Optional Packages: --with-libstdc=DIR use libstdc++ in DIR (for GNU C++) --without-bzlib disable BZLIB support --with-x use the X Window System - --without-ziplib disable ZIPLIB support + --without-zip disable ZIP support --without-zlib disable ZLIB support --without-zstd disable ZSTD support --with-apple-font-dir=DIR @@ -2030,7 +2024,7 @@ Optional Packages: --without-dps disable Display Postscript support --with-dejavu-font-dir=DIR DejaVu font directory - --without-fftw disable FFTW support + --with-fftw enable FFTW support --without-flif disable FLIF support --without-fpx disable FlashPIX support --without-djvu disable DjVu support @@ -2045,7 +2039,7 @@ Optional Packages: --without-heic disable HEIC support --without-jbig disable JBIG support --without-jpeg disable JPEG support - --without-jxl disable JPEG-XL support + --with-jxl enable JPEG-XL support --without-lcms disable lcms (v1.1X) support --without-openjp2 disable OpenJP2 support --without-lqr disable Liquid Rescale support @@ -2084,9 +2078,8 @@ Some influential environment variables: CXXFLAGS C++ compiler flags CXXCPP C++ preprocessor XMKMF Path to xmkmf, Makefile generator for X Window System - ZIPLIB_CFLAGS - C compiler flags for ZIPLIB, overriding pkg-config - ZIPLIB_LIBS linker flags for ZIPLIB, overriding pkg-config + ZIP_CFLAGS C compiler flags for ZIP, overriding pkg-config + ZIP_LIBS linker flags for ZIP, overriding pkg-config ZLIB_CFLAGS C compiler flags for ZLIB, overriding pkg-config ZLIB_LIBS linker flags for ZLIB, overriding pkg-config LIBZSTD_CFLAGS @@ -2223,7 +2216,7 @@ fi test -n "$ac_init_help" && exit $ac_status if $ac_init_version; then cat <<\_ACEOF -ImageMagick configure 7.0.10-57 +ImageMagick configure 7.0.11-8 generated by GNU Autoconf 2.69 Copyright (C) 2012 Free Software Foundation, Inc. @@ -3274,7 +3267,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-57, which was +It was created by ImageMagick $as_me 7.0.11-8, which was generated by GNU Autoconf 2.69. Invocation command line was $ $0 $@ @@ -3626,6 +3619,7 @@ ac_compiler_gnu=$ac_cv_c_compiler_gnu + ac_aux_dir= for ac_dir in config "$srcdir"/config; do if test -f "$ac_dir/install-sh"; then @@ -3774,6 +3768,7 @@ test -n "$target_alias" && program_prefix=${target_alias}- + am__api_version='1.16' # Find a good install program. We prefer a C program (faster), @@ -4260,18 +4255,9 @@ fi # Define the identity of the package. PACKAGE='ImageMagick' - VERSION='7.0.10-57' - - -cat >>confdefs.h <<_ACEOF -#define PACKAGE "$PACKAGE" -_ACEOF + VERSION='7.0.11-8' -cat >>confdefs.h <<_ACEOF -#define VERSION "$VERSION" -_ACEOF - # Some tools Automake needs. ACLOCAL=${ACLOCAL-"${am_missing_run}aclocal-${am__api_version}"} @@ -4469,6 +4455,7 @@ END fi fi + # Check whether --enable-silent-rules was given. if test "${enable_silent_rules+set}" = set; then : enableval=$enable_silent_rules; @@ -4508,6 +4495,8 @@ else fi AM_BACKSLASH='\' +CONFIGURE_DEPENDENCIES="$CONFIGURE_DEPENDENCIES \$(top_srcdir)/ChangeLog \$(top_srcdir)/m4/version.m4" + # # Save initial user-tunable values @@ -4525,18 +4514,7 @@ done CONFIGURE_ARGS="$0 ${ac_configure_args}" -# Check whether --enable-reproducible-build was given. -if test "${enable_reproducible_build+set}" = set; then : - enableval=$enable_reproducible_build; enable_reproducible_build=$enableval -else - enable_reproducible_build='no' -fi - - -# Source file containing package/library versioning information. -. ${srcdir}/version.sh - -echo "configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM}" +echo "Configuring ${PACKAGE_NAME} ${PACKAGE_VERSION}" MAGICK_TARGET_CPU=$host_cpu @@ -4568,31 +4546,43 @@ MAGICK_MAJOR_VERSION=7 MAGICK_MINOR_VERSION=0 -MAGICK_MICRO_VERSION=10 +MAGICK_MICRO_VERSION=11 -MAGICK_PATCHLEVEL_VERSION=57 +MAGICK_PATCHLEVEL_VERSION=8 -MAGICK_VERSION=7.0.10-57 +MAGICK_VERSION=7.0.11-8 -MAGICK_GIT_REVISION=18193:4633fa369:20210105 +MAGICK_GIT_REVISION=18619:8ea469ae9:20210412 # Substitute library versioning +MAGICK_LIBRARY_CURRENT=9 +MAGICK_LIBRARY_REVISION=0 +MAGICK_LIBRARY_AGE=0 MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE` MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE +MAGICKPP_LIBRARY_CURRENT=5 +MAGICKPP_LIBRARY_REVISION=0 +MAGICKPP_LIBRARY_AGE=0 MAGICKPP_LIBRARY_CURRENT_MIN=`expr $MAGICKPP_LIBRARY_CURRENT - $MAGICKPP_LIBRARY_AGE` MAGICKPP_LIBRARY_VERSION_INFO=$MAGICKPP_LIBRARY_CURRENT:$MAGICKPP_LIBRARY_REVISION:$MAGICKPP_LIBRARY_AGE -if test X$enable_reproducible_build = Xyes; then : - PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_REPRODUCIBLE -elif PACKAGE_RELEASE_DATE=$PACKAGE_RELEASE_DATE_RAW; then : +PACKAGE_BASE_VERSION=7.0.11 -fi +PACKAGE_PATCHLEVEL_VERSION=8 + +PACKAGE_VERSION_ADDENDUM=-8 + +PACKAGE_LIB_VERSION=0x70B + +PACKAGE_LIB_VERSION_NUMBER=7,0,11,8 + +PACKAGE_RELEASE_DATE=2021-04-11 # Ensure that make can run correctly @@ -4681,7 +4671,7 @@ MAGICK_LIB_VERSION=${MAGICK_LIB_VERSION}${MAGICK_LIBRARY_REVISION} # Definition used to define MagickLibVersionText in version.h -MAGICK_LIB_VERSION_TEXT="${PACKAGE_VERSION}" +MAGICK_LIB_VERSION_TEXT="${PACKAGE_BASE_VERSION}" # Definition used to define MagickLibVersionNumber in version.h @@ -4704,19 +4694,13 @@ MAGICKPP_LIB_VERSION=${MAGICKPP_LIB_VERSION}${MAGICKPP_LIBRARY_REVISION} # Definition used to define MagickLibVersionText in version.h -MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_VERSION}" +MAGICKPP_LIB_VERSION_TEXT="${PACKAGE_BASE_VERSION}" # Definition used to define MagickLibVersionNumber in version.h MAGICK_LIB_VERSION_NUMBER="${MAGICK_LIBRARY_CURRENT},${MAGICK_LIBRARY_AGE},${MAGICK_LIBRARY_REVISION}" - - -# Regenerate config.status if ChangeLog or version.sh is updated. -CONFIG_STATUS_DEPENDENCIES='$(top_srcdir)/version.sh' - - PERLMAINCC=$CC MAGICK_CFLAGS='' @@ -8315,6 +8299,98 @@ fi done +if test -n "$ac_tool_prefix"; then + # Extract the first word of "${ac_tool_prefix}ranlib", so it can be a program name with args. +set dummy ${ac_tool_prefix}ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$RANLIB"; then + ac_cv_prog_RANLIB="$RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_RANLIB="${ac_tool_prefix}ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +RANLIB=$ac_cv_prog_RANLIB +if test -n "$RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $RANLIB" >&5 +$as_echo "$RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + +fi +if test -z "$ac_cv_prog_RANLIB"; then + ac_ct_RANLIB=$RANLIB + # Extract the first word of "ranlib", so it can be a program name with args. +set dummy ranlib; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if ${ac_cv_prog_ac_ct_RANLIB+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test -n "$ac_ct_RANLIB"; then + ac_cv_prog_ac_ct_RANLIB="$ac_ct_RANLIB" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then + ac_cv_prog_ac_ct_RANLIB="ranlib" + $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done + done +IFS=$as_save_IFS + +fi +fi +ac_ct_RANLIB=$ac_cv_prog_ac_ct_RANLIB +if test -n "$ac_ct_RANLIB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_ct_RANLIB" >&5 +$as_echo "$ac_ct_RANLIB" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + if test "x$ac_ct_RANLIB" = x; then + RANLIB=":" + else + case $cross_compiling:$ac_tool_warned in +yes:) +{ $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: using cross tools not prefixed with host triplet" >&5 +$as_echo "$as_me: WARNING: using cross tools not prefixed with host triplet" >&2;} +ac_tool_warned=yes ;; +esac + RANLIB=$ac_ct_RANLIB + fi +else + RANLIB="$ac_cv_prog_RANLIB" +fi + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if malloc debugging is wanted" >&5 $as_echo_n "checking if malloc debugging is wanted... " >&6; } @@ -9092,7 +9168,7 @@ case "${host_os}" in native_win32_build='yes' ;; esac - if test "${native_win32_build}" = 'yes' ; then + if test "${native_win32_build}" = 'yes'; then WIN32_NATIVE_BUILD_TRUE= WIN32_NATIVE_BUILD_FALSE='#' else @@ -9100,7 +9176,7 @@ else WIN32_NATIVE_BUILD_FALSE= fi - if test "${cygwin_build}" = 'yes' ; then + if test "${cygwin_build}" = 'yes'; then CYGWIN_BUILD_TRUE= CYGWIN_BUILD_FALSE='#' else @@ -10011,7 +10087,7 @@ no_cl=yes if test "${enable_opencl+set}" = set; then : enableval=$enable_opencl; enable_opencl=$enableval else - enable_opencl='yes' + enable_opencl='no' fi if test x"$enable_opencl" != xno ; then @@ -21880,7 +21956,7 @@ if test "$enable_static" = 'yes'; then libtool_build_static_libs='yes' fi - if test "${libtool_build_shared_libs}" = 'yes'; then + if test "${libtool_build_shared_libs}" = 'yes'; then WITH_SHARED_LIBS_TRUE= WITH_SHARED_LIBS_FALSE='#' else @@ -21917,7 +21993,7 @@ $as_echo "#define BUILD_MODULES 1" >>confdefs.h MAGICK_FEATURES="$MAGICK_FEATURES Modules" fi - if test "$build_modules" != 'no'; then + if test "$build_modules" != 'no'; then WITH_MODULES_TRUE= WITH_MODULES_FALSE='#' else @@ -22167,12 +22243,12 @@ fi if test "$with_method_prefix" != 'no'; then cat >>confdefs.h <<_ACEOF -#define NAMESPACE_PREFIX "$with_method_prefix" +#define NAMESPACE_PREFIX $with_method_prefix _ACEOF cat >>confdefs.h <<_ACEOF -#define NAMESPACE_PREFIX_TAG "$with_method_prefix" +#define NAMESPACE_PREFIX_TAG $with_method_prefix _ACEOF DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix " @@ -22186,7 +22262,7 @@ else with_legacy_support='no' fi - if test "$with_legacy_support" != 'no'; then + if test "$with_legacy_support" != 'no'; then LEGACY_SUPPORT_TRUE= LEGACY_SUPPORT_FALSE='#' else @@ -22204,7 +22280,7 @@ else with_utilities='yes' fi - if test "$with_utilities" = 'yes'; then + if test "$with_utilities" = 'yes'; then WITH_UTILITIES_TRUE= WITH_UTILITIES_FALSE='#' else @@ -22759,7 +22835,7 @@ fi # Check additional headers -for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/uio.h sys/wait.h utime.h wchar.h xlocale.h +for ac_header in arm/limits.h arpa/inet.h complex.h errno.h fcntl.h float.h limits.h linux/unistd.h locale.h machine/param.h mach-o/dyld.h malloc.h netdb.h netinet/in.h OS.h process.h sun_prefetch.h stdarg.h stddef.h sys/ipc.h sys/mman.h sys/resource.h sys/sendfile.h sys/socket.h sys/syslimits.h sys/time.h sys/timeb.h sys/times.h sys/uio.h sys/wait.h utime.h wchar.h xlocale.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` ac_fn_c_check_header_mongrel "$LINENO" "$ac_header" "$as_ac_Header" "$ac_includes_default" @@ -24257,6 +24333,39 @@ cat >>confdefs.h <<_ACEOF _ACEOF +# The cast to long int works around a bug in the HP C Compiler +# version HP92453-01 B.11.11.23709.GP, which incorrectly rejects +# declarations like `int a3[[(sizeof (unsigned char)) >= 0]];'. +# This bug is HP SR number 8606223364. +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking size of ssize_t" >&5 +$as_echo_n "checking size of ssize_t... " >&6; } +if ${ac_cv_sizeof_ssize_t+:} false; then : + $as_echo_n "(cached) " >&6 +else + if ac_fn_c_compute_int "$LINENO" "(long int) (sizeof (ssize_t))" "ac_cv_sizeof_ssize_t" "$ac_includes_default"; then : + +else + if test "$ac_cv_type_ssize_t" = yes; then + { { $as_echo "$as_me:${as_lineno-$LINENO}: error: in \`$ac_pwd':" >&5 +$as_echo "$as_me: error: in \`$ac_pwd':" >&2;} +as_fn_error 77 "cannot compute sizeof (ssize_t) +See \`config.log' for more details" "$LINENO" 5; } + else + ac_cv_sizeof_ssize_t=0 + fi +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_sizeof_ssize_t" >&5 +$as_echo "$ac_cv_sizeof_ssize_t" >&6; } + + + +cat >>confdefs.h <<_ACEOF +#define SIZEOF_SSIZE_T $ac_cv_sizeof_ssize_t +_ACEOF + + # The cast to long int works around a bug in the HP C Compiler # version HP92453-01 B.11.11.23709.GP, which incorrectly rejects @@ -24802,6 +24911,73 @@ $as_echo "#define HAVE_WORKING_FORK 1" >>confdefs.h fi +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible malloc" >&5 +$as_echo_n "checking for GNU libc compatible malloc... " >&6; } +if ${ac_cv_func_malloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_malloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include <stdlib.h> +#else +char *malloc (); +#endif + +int +main () +{ +return ! malloc (0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_malloc_0_nonnull=yes +else + ac_cv_func_malloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_malloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_malloc_0_nonnull" >&6; } +if test $ac_cv_func_malloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_MALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_MALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" malloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS malloc.$ac_objext" + ;; +esac + + +$as_echo "#define malloc rpl_malloc" >>confdefs.h + +fi + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for working memcmp" >&5 $as_echo_n "checking for working memcmp... " >&6; } if ${ac_cv_func_memcmp_working+:} false; then : @@ -24864,6 +25040,73 @@ test $ac_cv_func_memcmp_working = no && case " $LIBOBJS " in esac +for ac_header in stdlib.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "stdlib.h" "ac_cv_header_stdlib_h" "$ac_includes_default" +if test "x$ac_cv_header_stdlib_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_STDLIB_H 1 +_ACEOF + +fi + +done + +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for GNU libc compatible realloc" >&5 +$as_echo_n "checking for GNU libc compatible realloc... " >&6; } +if ${ac_cv_func_realloc_0_nonnull+:} false; then : + $as_echo_n "(cached) " >&6 +else + if test "$cross_compiling" = yes; then : + ac_cv_func_realloc_0_nonnull=no +else + cat confdefs.h - <<_ACEOF >conftest.$ac_ext +/* end confdefs.h. */ +#if defined STDC_HEADERS || defined HAVE_STDLIB_H +# include <stdlib.h> +#else +char *realloc (); +#endif + +int +main () +{ +return ! realloc (0, 0); + ; + return 0; +} +_ACEOF +if ac_fn_c_try_run "$LINENO"; then : + ac_cv_func_realloc_0_nonnull=yes +else + ac_cv_func_realloc_0_nonnull=no +fi +rm -f core *.core core.conftest.* gmon.out bb.out conftest$ac_exeext \ + conftest.$ac_objext conftest.beam conftest.$ac_ext +fi + +fi +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_func_realloc_0_nonnull" >&5 +$as_echo "$ac_cv_func_realloc_0_nonnull" >&6; } +if test $ac_cv_func_realloc_0_nonnull = yes; then : + +$as_echo "#define HAVE_REALLOC 1" >>confdefs.h + +else + $as_echo "#define HAVE_REALLOC 0" >>confdefs.h + + case " $LIBOBJS " in + *" realloc.$ac_objext "* ) ;; + *) LIBOBJS="$LIBOBJS realloc.$ac_objext" + ;; +esac + + +$as_echo "#define realloc rpl_realloc" >>confdefs.h + +fi + + for ac_header in sys/select.h sys/socket.h do : as_ac_Header=`$as_echo "ac_cv_header_$ac_header" | $as_tr_sh` @@ -26188,7 +26431,7 @@ $as_echo_n "checking whether C++ compiler is sufficient for Magick++... " >&6; } $as_echo "$have_magick_plus_plus" >&6; } LIBS="$OLIBS" fi - if test "$have_magick_plus_plus" = 'yes'; then + if test "$have_magick_plus_plus" = 'yes'; then WITH_MAGICK_PLUS_PLUS_TRUE= WITH_MAGICK_PLUS_PLUS_FALSE='#' else @@ -26667,7 +26910,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_jemalloc" = 'yes'; then + if test "$have_jemalloc" = 'yes'; then HAVE_JEMALLOC_TRUE= HAVE_JEMALLOC_FALSE='#' else @@ -26684,8 +26927,8 @@ have_tcmalloc='no' TCMALLOC_LIBS='' OLIBS="$LIBS" if test "$have_threads" = 'yes' -a "$with_tcmalloc" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking tcmalloc library support " >&5 -$as_echo_n "checking tcmalloc library support ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking tcmalloc library support" >&5 +$as_echo_n "checking tcmalloc library support... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } failed=0 @@ -26747,8 +26990,8 @@ $as_echo "#define HAVE_TCMALLOC 1" >>confdefs.h have_tcmalloc='yes' fi fi - { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcmalloc memory allocation library is complete " >&5 -$as_echo_n "checking if tcmalloc memory allocation library is complete ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking if tcmalloc memory allocation library is complete" >&5 +$as_echo_n "checking if tcmalloc memory allocation library is complete... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: $have_tcmalloc" >&5 $as_echo "$have_tcmalloc" >&6; } fi @@ -26890,7 +27133,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_umem" = 'yes'; then + if test "$have_umem" = 'yes'; then HAVE_UMEM_TRUE= HAVE_UMEM_FALSE='#' else @@ -27169,7 +27412,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_bzlib" = 'yes'; then + if test "$have_bzlib" = 'yes'; then BZLIB_DELEGATE_TRUE= BZLIB_DELEGATE_FALSE='#' else @@ -28059,7 +28302,7 @@ if test "$no_x" != 'yes'; then else have_x='no' fi - if test "$have_x" = 'yes'; then + if test "$have_x" = 'yes'; then X11_DELEGATE_TRUE= X11_DELEGATE_FALSE='#' else @@ -28072,26 +28315,26 @@ fi # -# Check for ZIPLIB +# Check for ZIP # -# Check whether --with-ziplib was given. -if test "${with_ziplib+set}" = set; then : - withval=$with_ziplib; with_ziplib=$withval +# Check whether --with-zip was given. +if test "${with_zip+set}" = set; then : + withval=$with_zip; with_zip=$withval else - with_ziplib='yes' + with_zip='yes' fi -if test "$with_ziplib" != 'yes'; then - DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-ziplib=$with_ziplib " +if test "$with_zip" != 'yes'; then + DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-zip=$with_zip " fi -have_ziplib='no' -ZIPLIB_CFLAGS="" -ZIPLIB_LIBS="" -ZIPLIB_PKG="" -if test "x$with_ziplib" = "xyes"; then +have_zip='no' +ZIP_CFLAGS="" +ZIP_LIBS="" +ZIP_PKG="" +if test "x$with_zip" = "xyes"; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5 $as_echo "-------------------------------------------------------------" >&6; } @@ -28099,8 +28342,8 @@ pkg_failed=no { $as_echo "$as_me:${as_lineno-$LINENO}: checking for libzip >= 1.0.0" >&5 $as_echo_n "checking for libzip >= 1.0.0... " >&6; } -if test -n "$ZIPLIB_CFLAGS"; then - pkg_cv_ZIPLIB_CFLAGS="$ZIPLIB_CFLAGS" +if test -n "$ZIP_CFLAGS"; then + pkg_cv_ZIP_CFLAGS="$ZIP_CFLAGS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 1.0.0\""; } >&5 @@ -28108,7 +28351,7 @@ if test -n "$ZIPLIB_CFLAGS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ZIPLIB_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 1.0.0" 2>/dev/null` + pkg_cv_ZIP_CFLAGS=`$PKG_CONFIG --cflags "libzip >= 1.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -28116,8 +28359,8 @@ fi else pkg_failed=untried fi -if test -n "$ZIPLIB_LIBS"; then - pkg_cv_ZIPLIB_LIBS="$ZIPLIB_LIBS" +if test -n "$ZIP_LIBS"; then + pkg_cv_ZIP_LIBS="$ZIP_LIBS" elif test -n "$PKG_CONFIG"; then if test -n "$PKG_CONFIG" && \ { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libzip >= 1.0.0\""; } >&5 @@ -28125,7 +28368,7 @@ if test -n "$ZIPLIB_LIBS"; then ac_status=$? $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5 test $ac_status = 0; }; then - pkg_cv_ZIPLIB_LIBS=`$PKG_CONFIG --libs "libzip >= 1.0.0" 2>/dev/null` + pkg_cv_ZIP_LIBS=`$PKG_CONFIG --libs "libzip >= 1.0.0" 2>/dev/null` test "x$?" != "x0" && pkg_failed=yes else pkg_failed=yes @@ -28146,43 +28389,43 @@ else _pkg_short_errors_supported=no fi if test $_pkg_short_errors_supported = yes; then - ZIPLIB_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip >= 1.0.0" 2>&1` + ZIP_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors --cflags --libs "libzip >= 1.0.0" 2>&1` else - ZIPLIB_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip >= 1.0.0" 2>&1` + ZIP_PKG_ERRORS=`$PKG_CONFIG --print-errors --cflags --libs "libzip >= 1.0.0" 2>&1` fi # Put the nasty error message in config.log where it belongs - echo "$ZIPLIB_PKG_ERRORS" >&5 + echo "$ZIP_PKG_ERRORS" >&5 - have_ziplib=no + have_zip=no elif test $pkg_failed = untried; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } - have_ziplib=no + have_zip=no else - ZIPLIB_CFLAGS=$pkg_cv_ZIPLIB_CFLAGS - ZIPLIB_LIBS=$pkg_cv_ZIPLIB_LIBS + ZIP_CFLAGS=$pkg_cv_ZIP_CFLAGS + ZIP_LIBS=$pkg_cv_ZIP_LIBS { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } - have_ziplib=yes + have_zip=yes fi { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } fi -if test "$have_ziplib" = 'yes'; then +if test "$have_zip" = 'yes'; then -$as_echo "#define ZIPLIB_DELEGATE 1" >>confdefs.h +$as_echo "#define ZIP_DELEGATE 1" >>confdefs.h - CFLAGS="$ZIPLIB_CFLAGS $CFLAGS" - LIBS="$ZIPLIB_LIBS $LIBS" + CFLAGS="$ZIP_CFLAGS $CFLAGS" + LIBS="$ZIP_LIBS $LIBS" fi - if test "$have_ziplib" = 'yes'; then - ZIPLIB_DELEGATE_TRUE= - ZIPLIB_DELEGATE_FALSE='#' + if test "$have_zip" = 'yes'; then + ZIP_DELEGATE_TRUE= + ZIP_DELEGATE_FALSE='#' else - ZIPLIB_DELEGATE_TRUE='#' - ZIPLIB_DELEGATE_FALSE= + ZIP_DELEGATE_TRUE='#' + ZIP_DELEGATE_FALSE= fi @@ -28295,7 +28538,7 @@ $as_echo "#define ZLIB_DELEGATE 1" >>confdefs.h LIBS="$ZLIB_LIBS $LIBS" fi - if test "$have_zlib" = 'yes'; then + if test "$have_zlib" = 'yes'; then ZLIB_DELEGATE_TRUE= ZLIB_DELEGATE_FALSE='#' else @@ -28413,7 +28656,7 @@ $as_echo "#define ZSTD_DELEGATE 1" >>confdefs.h LIBS="$ZSTD_LIBS $LIBS" fi - if test "$have_zstd" = 'yes'; then + if test "$have_zstd" = 'yes'; then ZSTD_DELEGATE_TRUE= ZSTD_DELEGATE_FALSE='#' else @@ -28525,7 +28768,7 @@ as_fn_error 1 "libltdl is required for modules and OpenCL builds See \`config.log' for more details" "$LINENO" 5; } fi fi - if test "$have_ltdl" != 'no'; then + if test "$have_ltdl" != 'no'; then WITH_LTDL_TRUE= WITH_LTDL_FALSE='#' else @@ -28924,7 +29167,7 @@ $as_echo "no" >&6; } CPPFLAGS=$PERSIST_CPPFLAGS fi fi - if test "$have_dps" = 'yes'; then + if test "$have_dps" = 'yes'; then DPS_DELEGATE_TRUE= DPS_DELEGATE_FALSE='#' else @@ -28960,7 +29203,7 @@ fi if test "${with_fftw+set}" = set; then : withval=$with_fftw; with_fftw=$withval else - with_fftw='yes' + with_fftw='no' fi @@ -29059,7 +29302,7 @@ $as_echo "#define FFTW_DELEGATE 1" >>confdefs.h CFLAGS="$fftw3_CFLAGS $CFLAGS" fi - if test "$have_fftw" = 'yes'; then + if test "$have_fftw" = 'yes'; then FFTW_DELEGATE_TRUE= FFTW_DELEGATE_FALSE='#' else @@ -29294,7 +29537,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_fpx" = 'yes'; then + if test "$have_fpx" = 'yes'; then FPX_DELEGATE_TRUE= FPX_DELEGATE_FALSE='#' else @@ -29412,7 +29655,7 @@ $as_echo "#define DJVU_DELEGATE 1" >>confdefs.h CFLAGS="$ddjvuapi_CFLAGS $CFLAGS" fi - if test "$have_djvu" = 'yes'; then + if test "$have_djvu" = 'yes'; then DJVU_DELEGATE_TRUE= DJVU_DELEGATE_FALSE='#' else @@ -29759,7 +30002,7 @@ $as_echo "#define RAQM_DELEGATE 1" >>confdefs.h CFLAGS="$RAQM_CFLAGS $CFLAGS" fi - if test "$have_raqm" = 'yes'; then + if test "$have_raqm" = 'yes'; then RAQM_DELEGATE_TRUE= RAQM_DELEGATE_FALSE='#' else @@ -30020,7 +30263,7 @@ $as_echo "#define GS_DELEGATE 1" >>confdefs.h $as_echo "no" >&6; } fi fi - if test "$have_gslib" = 'yes'; then + if test "$have_gslib" = 'yes'; then GS_DELEGATE_TRUE= GS_DELEGATE_FALSE='#' else @@ -30170,7 +30413,7 @@ $as_echo "#define GVC_DELEGATE 1" >>confdefs.h CFLAGS="$GVC_CFLAGS $CFLAGS" fi - if test "$have_gvc" = 'yes'; then + if test "$have_gvc" = 'yes'; then GVC_DELEGATE_TRUE= GVC_DELEGATE_FALSE='#' else @@ -30287,7 +30530,7 @@ $as_echo "#define HEIC_DELEGATE 1" >>confdefs.h CFLAGS="$HEIF_CFLAGS $CFLAGS" fi - if test "$have_heic" = 'yes'; then + if test "$have_heic" = 'yes'; then HEIC_DELEGATE_TRUE= HEIC_DELEGATE_FALSE='#' else @@ -30395,7 +30638,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_jbig" = 'yes'; then + if test "$have_jbig" = 'yes'; then JBIG_DELEGATE_TRUE= JBIG_DELEGATE_FALSE='#' else @@ -30530,7 +30773,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_jpeg" = 'yes'; then + if test "$have_jpeg" = 'yes'; then JPEG_DELEGATE_TRUE= JPEG_DELEGATE_FALSE='#' else @@ -30542,7 +30785,7 @@ fi # -# Check for Jpegxl delegate library. +# Check for JPEG-XL delegate library. # # Check whether --with-jxl was given. @@ -30634,9 +30877,9 @@ else failed=`expr $failed + 1` fi - { $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 "$as_me:${as_lineno-$LINENO}: checking for JxlEncoderSetBasicInfo in -ljxl" >&5 +$as_echo_n "checking for JxlEncoderSetBasicInfo in -ljxl... " >&6; } +if ${ac_cv_lib_jxl_JxlEncoderSetBasicInfo+:} false; then : $as_echo_n "(cached) " >&6 else ac_check_lib_save_LIBS=$LIBS @@ -30650,27 +30893,27 @@ cat confdefs.h - <<_ACEOF >conftest.$ac_ext #ifdef __cplusplus extern "C" #endif -char JxlEncoderCreate (); +char JxlEncoderSetBasicInfo (); int main () { -return JxlEncoderCreate (); +return JxlEncoderSetBasicInfo (); ; return 0; } _ACEOF if ac_fn_c_try_link "$LINENO"; then : - ac_cv_lib_jxl_JxlEncoderCreate=yes + ac_cv_lib_jxl_JxlEncoderSetBasicInfo=yes else - ac_cv_lib_jxl_JxlEncoderCreate=no + ac_cv_lib_jxl_JxlEncoderSetBasicInfo=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_jxl_JxlEncoderCreate" >&5 -$as_echo "$ac_cv_lib_jxl_JxlEncoderCreate" >&6; } -if test "x$ac_cv_lib_jxl_JxlEncoderCreate" = xyes; then : +{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jxl_JxlEncoderSetBasicInfo" >&5 +$as_echo "$ac_cv_lib_jxl_JxlEncoderSetBasicInfo" >&6; } +if test "x$ac_cv_lib_jxl_JxlEncoderSetBasicInfo" = xyes; then : passed=`expr $passed + 1` else failed=`expr $failed + 1` @@ -30700,7 +30943,7 @@ $as_echo "yes" >&6; } $as_echo "no" >&6; } fi fi - if test "$have_jxl" = 'yes'; then + if test "$have_jxl" = 'yes'; then JXL_DELEGATE_TRUE= JXL_DELEGATE_FALSE='#' else @@ -30832,7 +31075,7 @@ $as_echo "#define HAVE_LCMS2_H 1" >>confdefs.h fi fi - if test "$have_lcms" = 'yes'; then + if test "$have_lcms" = 'yes'; then LCMS_DELEGATE_TRUE= LCMS_DELEGATE_FALSE='#' else @@ -30949,7 +31192,7 @@ $as_echo "#define LIBOPENJP2_DELEGATE 1" >>confdefs.h CFLAGS="$LIBOPENJP2_CFLAGS $CFLAGS" fi - if test "$have_openjp2" = 'yes'; then + if test "$have_openjp2" = 'yes'; then LIBOPENJP2_DELEGATE_TRUE= LIBOPENJP2_DELEGATE_FALSE='#' else @@ -31067,7 +31310,7 @@ $as_echo "#define LQR_DELEGATE 1" >>confdefs.h CFLAGS="$LQR_CFLAGS $CFLAGS" fi - if test "$have_lqr" = 'yes'; then + if test "$have_lqr" = 'yes'; then LQR_DELEGATE_TRUE= LQR_DELEGATE_FALSE='#' else @@ -31180,7 +31423,7 @@ $as_echo "#define LZMA_DELEGATE 1" >>confdefs.h CFLAGS="$LZMA_CFLAGS $CFLAGS" fi - if test "$have_lzma" = 'yes'; then + if test "$have_lzma" = 'yes'; then LZMA_DELEGATE_TRUE= LZMA_DELEGATE_FALSE='#' else @@ -31297,7 +31540,7 @@ $as_echo "#define OPENEXR_DELEGATE 1" >>confdefs.h CFLAGS="$OPENEXR_CFLAGS $CFLAGS" fi - if test "$have_openexr" = 'yes'; then + if test "$have_openexr" = 'yes'; then OPENEXR_DELEGATE_TRUE= OPENEXR_DELEGATE_FALSE='#' else @@ -31495,7 +31738,7 @@ $as_echo "#define PANGOCAIRO_DELEGATE 1" >>confdefs.h CFLAGS="$PANGOCAIRO_CFLAGS $CFLAGS" fi - if test "$have_pango" = 'yes'; then + if test "$have_pango" = 'yes'; then PANGO_DELEGATE_TRUE= PANGO_DELEGATE_FALSE='#' else @@ -31503,7 +31746,7 @@ else PANGO_DELEGATE_FALSE= fi - if test "$have_pangocairo" = 'yes'; then + if test "$have_pangocairo" = 'yes'; then PANGOCAIRO_DELEGATE_TRUE= PANGOCAIRO_DELEGATE_FALSE='#' else @@ -31620,7 +31863,7 @@ $as_echo "#define PNG_DELEGATE 1" >>confdefs.h CFLAGS="$PNG_CFLAGS $CFLAGS" fi - if test "$have_png" = 'yes'; then + if test "$have_png" = 'yes'; then PNG_DELEGATE_TRUE= PNG_DELEGATE_FALSE='#' else @@ -31737,7 +31980,7 @@ $as_echo "#define RAW_R_DELEGATE 1" >>confdefs.h CFLAGS="$RAW_R_CFLAGS $CFLAGS" fi - if test "$have_raw" = 'yes'; then + if test "$have_raw" = 'yes'; then RAW_R_DELEGATE_TRUE= RAW_R_DELEGATE_FALSE='#' else @@ -31935,7 +32178,7 @@ $as_echo "#define CAIRO_DELEGATE 1" >>confdefs.h CFLAGS="$CAIRO_SVG_CFLAGS $CFLAGS" fi - if test "$have_rsvg" = 'yes'; then + if test "$have_rsvg" = 'yes'; then RSVG_DELEGATE_TRUE= RSVG_DELEGATE_FALSE='#' else @@ -31943,7 +32186,7 @@ else RSVG_DELEGATE_FALSE= fi - if test "$have_cairo" = 'yes'; then + if test "$have_cairo" = 'yes'; then CAIRO_DELEGATE_TRUE= CAIRO_DELEGATE_FALSE='#' else @@ -32237,9 +32480,9 @@ fi done for ac_func in TIFFIsCODECConfigured TIFFMergeFieldInfo \ - TIFFIsBigEndian TIFFReadEXIFDirectory TIFFSetErrorHandlerExt \ - TIFFSetTagExtender TIFFSetWarningHandlerExt \ - TIFFSwabArrayOfTriples + TIFFIsBigEndian TIFFSetErrorHandlerExt TIFFSetTagExtender \ + TIFFReadEXIFDirectory TIFFReadGPSDirectory \ + TIFFSetWarningHandlerExt TIFFSwabArrayOfTriples do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -32257,7 +32500,7 @@ done $as_echo "no" >&6; } fi fi - if test "$have_tiff" = 'yes'; then + if test "$have_tiff" = 'yes'; then TIFF_DELEGATE_TRUE= TIFF_DELEGATE_FALSE='#' else @@ -32472,7 +32715,7 @@ $as_echo "#define WEBPMUX_DELEGATE 1" >>confdefs.h CFLAGS="$WEBPMUX_CFLAGS $CFLAGS" fi - if test "$have_webp" = 'yes'; then + if test "$have_webp" = 'yes'; then WEBP_DELEGATE_TRUE= WEBP_DELEGATE_FALSE='#' else @@ -32480,7 +32723,7 @@ else WEBP_DELEGATE_FALSE= fi - if test "$have_webpmux" = 'yes'; then + if test "$have_webpmux" = 'yes'; then WEBPMUX_DELEGATE_TRUE= WEBPMUX_DELEGATE_FALSE='#' else @@ -32532,8 +32775,8 @@ WMF_LIBS='' WMF_CFLAGS='' OLIBS="$LIBS" if test "$with_wmf" != 'no'; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WMF support " >&5 -$as_echo_n "checking for WMF support ... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for WMF support" >&5 +$as_echo_n "checking for WMF support... " >&6; } { $as_echo "$as_me:${as_lineno-$LINENO}: result: " >&5 $as_echo "" >&6; } @@ -32605,8 +32848,8 @@ $as_echo "no -- some components failed test" >&6; } fi fi fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete " >&5 -$as_echo_n "checking if WMF package is complete ... " >&6; } +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking if WMF package is complete" >&5 +$as_echo_n "checking if WMF package is complete... " >&6; } if test "$have_wmf" = 'yes'; then { $as_echo "$as_me:${as_lineno-$LINENO}: result: yes" >&5 $as_echo "yes" >&6; } @@ -32731,7 +32974,7 @@ $as_echo "#define XML_DELEGATE 1" >>confdefs.h CFLAGS="$XML_CFLAGS $CFLAGS" fi - if test "$have_xml" = 'yes'; then + if test "$have_xml" = 'yes'; then XML_DELEGATE_TRUE= XML_DELEGATE_FALSE='#' else @@ -32745,7 +32988,7 @@ fi # Check for functions # -for ac_func in acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat +for ac_func in acosh _aligned_malloc aligned_malloc asinh atanh atoll atexit cabs carg cimag creal clock clock_getres clock_gettime ctime_r directio erf _exit execvp fchmod floor fork ftime ftruncate getc_unlocked getcwd getpid getexecname getdtablesize getpagesize getpwnam_r getrlimit getrusage gettimeofday gmtime_r isnan j0 j1 lltostr localtime_r lstat memmove memset mkdir mkstemp munmap nanosleep newlocale _NSGetExecutablePath pclose _pclose poll popen _popen posix_fadvise posix_fallocate posix_madvise posix_memalign posix_spawnp pow pread putenv pwrite qsort_r raise rand_r readlink realpath select seekdir sendfile setlocale socket sqrt setvbuf stat strcasestr strchr strrchr strcspn strdup strpbrk strspn strstr strtod strtod_l strtol strtoul symlink sysconf sigemptyset sigaction spawnvp strerror strlcat strlcpy strcasecmp strncasecmp telldir tempnam times ulltostr uselocale usleep utime vfprintf vfprintf_l vsprintf vsnprintf vsnprintf_l waitpid _wfopen _wstat do : as_ac_var=`$as_echo "ac_cv_func_$ac_func" | $as_tr_sh` ac_fn_c_check_func "$LINENO" "$ac_func" "$as_ac_var" @@ -32798,7 +33041,7 @@ _ACEOF # Subdirectory under lib to place ImageMagick lib files -LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}" +LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_BASE_VERSION}" cat >>confdefs.h <<_ACEOF #define LIBRARY_RELATIVE_PATH "$LIBRARY_RELATIVE_PATH" @@ -33082,8 +33325,8 @@ WWWDecodeDelegateDefault='curl' XPSDelegateDefault='gxps' # Search for delegates -# Extract the first word of " "$BPGDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$BPGDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$BPGDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$BPGDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_BPGDecodeDelegate+:} false; then : @@ -33109,7 +33352,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_BPGDecodeDelegate" && ac_cv_path_BPGDecodeDelegate=" "$BPGDecodeDelegateDefault"" + test -z "$ac_cv_path_BPGDecodeDelegate" && ac_cv_path_BPGDecodeDelegate=""$BPGDecodeDelegateDefault"" ;; esac fi @@ -33123,8 +33366,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$BPGEncodeDelegateDefault"", so it can be a program name with args. -set dummy "$BPGEncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$BPGEncodeDelegateDefault"", so it can be a program name with args. +set dummy "$BPGEncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_BPGEncodeDelegate+:} false; then : @@ -33150,7 +33393,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_BPGEncodeDelegate" && ac_cv_path_BPGEncodeDelegate=" "$BPGEncodeDelegateDefault"" + test -z "$ac_cv_path_BPGEncodeDelegate" && ac_cv_path_BPGEncodeDelegate=""$BPGEncodeDelegateDefault"" ;; esac fi @@ -33164,8 +33407,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$BlenderDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$BlenderDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$BlenderDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$BlenderDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_BlenderDecodeDelegate+:} false; then : @@ -33191,7 +33434,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_BlenderDecodeDelegate" && ac_cv_path_BlenderDecodeDelegate=" "$BlenderDecodeDelegateDefault"" + test -z "$ac_cv_path_BlenderDecodeDelegate" && ac_cv_path_BlenderDecodeDelegate=""$BlenderDecodeDelegateDefault"" ;; esac fi @@ -33251,8 +33494,8 @@ fi done test -n "$BrowseDelegate" || BrowseDelegate=""$BrowseDelegateDefault"" -# Extract the first word of " "$DNGDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$DNGDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$DNGDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$DNGDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_DNGDecodeDelegate+:} false; then : @@ -33278,7 +33521,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_DNGDecodeDelegate" && ac_cv_path_DNGDecodeDelegate=" "$DNGDecodeDelegateDefault"" + test -z "$ac_cv_path_DNGDecodeDelegate" && ac_cv_path_DNGDecodeDelegate=""$DNGDecodeDelegateDefault"" ;; esac fi @@ -33292,8 +33535,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$DOCDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$DOCDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$DOCDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$DOCDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_DOCDecodeDelegate+:} false; then : @@ -33319,7 +33562,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_DOCDecodeDelegate" && ac_cv_path_DOCDecodeDelegate=" "$DOCDecodeDelegateDefault"" + test -z "$ac_cv_path_DOCDecodeDelegate" && ac_cv_path_DOCDecodeDelegate=""$DOCDecodeDelegateDefault"" ;; esac fi @@ -33333,8 +33576,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$DVIDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$DVIDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$DVIDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$DVIDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_DVIDecodeDelegate+:} false; then : @@ -33360,7 +33603,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_DVIDecodeDelegate" && ac_cv_path_DVIDecodeDelegate=" "$DVIDecodeDelegateDefault"" + test -z "$ac_cv_path_DVIDecodeDelegate" && ac_cv_path_DVIDecodeDelegate=""$DVIDecodeDelegateDefault"" ;; esac fi @@ -33374,8 +33617,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$ConvertDelegateDefault"", so it can be a program name with args. -set dummy "$ConvertDelegateDefault"; ac_word=$2 +# Extract the first word of ""$ConvertDelegateDefault"", so it can be a program name with args. +set dummy "$ConvertDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_ConvertDelegate+:} false; then : @@ -33401,7 +33644,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_ConvertDelegate" && ac_cv_path_ConvertDelegate=" "$ConvertDelegateDefault"" + test -z "$ac_cv_path_ConvertDelegate" && ac_cv_path_ConvertDelegate=""$ConvertDelegateDefault"" ;; esac fi @@ -33415,8 +33658,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$DisplayDelegateDefault"", so it can be a program name with args. -set dummy "$DisplayDelegateDefault"; ac_word=$2 +# Extract the first word of ""$DisplayDelegateDefault"", so it can be a program name with args. +set dummy "$DisplayDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_DisplayDelegate+:} false; then : @@ -33442,7 +33685,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_DisplayDelegate" && ac_cv_path_DisplayDelegate=" "$DisplayDelegateDefault"" + test -z "$ac_cv_path_DisplayDelegate" && ac_cv_path_DisplayDelegate=""$DisplayDelegateDefault"" ;; esac fi @@ -33456,8 +33699,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$EditorDelegateDefault"", so it can be a program name with args. -set dummy "$EditorDelegateDefault"; ac_word=$2 +# Extract the first word of ""$EditorDelegateDefault"", so it can be a program name with args. +set dummy "$EditorDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_EditorDelegate+:} false; then : @@ -33483,7 +33726,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_EditorDelegate" && ac_cv_path_EditorDelegate=" "$EditorDelegateDefault"" + test -z "$ac_cv_path_EditorDelegate" && ac_cv_path_EditorDelegate=""$EditorDelegateDefault"" ;; esac fi @@ -33497,8 +33740,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$GVCDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$GVCDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$GVCDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$GVCDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_GVCDecodeDelegate+:} false; then : @@ -33524,7 +33767,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_GVCDecodeDelegate" && ac_cv_path_GVCDecodeDelegate=" "$GVCDecodeDelegateDefault"" + test -z "$ac_cv_path_GVCDecodeDelegate" && ac_cv_path_GVCDecodeDelegate=""$GVCDecodeDelegateDefault"" ;; esac fi @@ -33538,8 +33781,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$HPGLDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$HPGLDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$HPGLDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$HPGLDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_HPGLDecodeDelegate+:} false; then : @@ -33565,7 +33808,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_HPGLDecodeDelegate" && ac_cv_path_HPGLDecodeDelegate=" "$HPGLDecodeDelegateDefault"" + test -z "$ac_cv_path_HPGLDecodeDelegate" && ac_cv_path_HPGLDecodeDelegate=""$HPGLDecodeDelegateDefault"" ;; esac fi @@ -33579,8 +33822,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$HTMLDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$HTMLDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$HTMLDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$HTMLDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_HTMLDecodeDelegate+:} false; then : @@ -33606,7 +33849,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_HTMLDecodeDelegate" && ac_cv_path_HTMLDecodeDelegate=" "$HTMLDecodeDelegateDefault"" + test -z "$ac_cv_path_HTMLDecodeDelegate" && ac_cv_path_HTMLDecodeDelegate=""$HTMLDecodeDelegateDefault"" ;; esac fi @@ -33620,8 +33863,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$ILBMDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$ILBMDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$ILBMDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$ILBMDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_ILBMDecodeDelegate+:} false; then : @@ -33647,7 +33890,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_ILBMDecodeDelegate" && ac_cv_path_ILBMDecodeDelegate=" "$ILBMDecodeDelegateDefault"" + test -z "$ac_cv_path_ILBMDecodeDelegate" && ac_cv_path_ILBMDecodeDelegate=""$ILBMDecodeDelegateDefault"" ;; esac fi @@ -33661,8 +33904,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$ILBMEncodeDelegateDefault"", so it can be a program name with args. -set dummy "$ILBMEncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$ILBMEncodeDelegateDefault"", so it can be a program name with args. +set dummy "$ILBMEncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_ILBMEncodeDelegate+:} false; then : @@ -33688,7 +33931,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_ILBMEncodeDelegate" && ac_cv_path_ILBMEncodeDelegate=" "$ILBMEncodeDelegateDefault"" + test -z "$ac_cv_path_ILBMEncodeDelegate" && ac_cv_path_ILBMEncodeDelegate=""$ILBMEncodeDelegateDefault"" ;; esac fi @@ -33702,8 +33945,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$JXRDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$JXRDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$JXRDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$JXRDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_JXRDecodeDelegate+:} false; then : @@ -33729,7 +33972,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_JXRDecodeDelegate" && ac_cv_path_JXRDecodeDelegate=" "$JXRDecodeDelegateDefault"" + test -z "$ac_cv_path_JXRDecodeDelegate" && ac_cv_path_JXRDecodeDelegate=""$JXRDecodeDelegateDefault"" ;; esac fi @@ -33743,8 +33986,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$JXREncodeDelegateDefault"", so it can be a program name with args. -set dummy "$JXREncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$JXREncodeDelegateDefault"", so it can be a program name with args. +set dummy "$JXREncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_JXREncodeDelegate+:} false; then : @@ -33770,7 +34013,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_JXREncodeDelegate" && ac_cv_path_JXREncodeDelegate=" "$JXREncodeDelegateDefault"" + test -z "$ac_cv_path_JXREncodeDelegate" && ac_cv_path_JXREncodeDelegate=""$JXREncodeDelegateDefault"" ;; esac fi @@ -33784,8 +34027,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$LEPDelegateDefault"", so it can be a program name with args. -set dummy "$LEPDelegateDefault"; ac_word=$2 +# Extract the first word of ""$LEPDelegateDefault"", so it can be a program name with args. +set dummy "$LEPDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_LEPDelegate+:} false; then : @@ -33811,7 +34054,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_LEPDelegate" && ac_cv_path_LEPDelegate=" "$LEPDelegateDefault"" + test -z "$ac_cv_path_LEPDelegate" && ac_cv_path_LEPDelegate=""$LEPDelegateDefault"" ;; esac fi @@ -33825,8 +34068,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$LPDelegateDefault"", so it can be a program name with args. -set dummy "$LPDelegateDefault"; ac_word=$2 +# Extract the first word of ""$LPDelegateDefault"", so it can be a program name with args. +set dummy "$LPDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_LPDelegate+:} false; then : @@ -33852,7 +34095,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_LPDelegate" && ac_cv_path_LPDelegate=" no" + test -z "$ac_cv_path_LPDelegate" && ac_cv_path_LPDelegate="no" ;; esac fi @@ -33866,8 +34109,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$LPRDelegateDefault"", so it can be a program name with args. -set dummy "$LPRDelegateDefault"; ac_word=$2 +# Extract the first word of ""$LPRDelegateDefault"", so it can be a program name with args. +set dummy "$LPRDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_LPRDelegate+:} false; then : @@ -33893,7 +34136,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_LPRDelegate" && ac_cv_path_LPRDelegate=" "$LPRDelegateDefault"" + test -z "$ac_cv_path_LPRDelegate" && ac_cv_path_LPRDelegate=""$LPRDelegateDefault"" ;; esac fi @@ -33907,8 +34150,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$LaunchDelegateDefault"", so it can be a program name with args. -set dummy "$LaunchDelegateDefault"; ac_word=$2 +# Extract the first word of ""$LaunchDelegateDefault"", so it can be a program name with args. +set dummy "$LaunchDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_LaunchDelegate+:} false; then : @@ -33934,7 +34177,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_LaunchDelegate" && ac_cv_path_LaunchDelegate=" "$LaunchDelegateDefault"" + test -z "$ac_cv_path_LaunchDelegate" && ac_cv_path_LaunchDelegate=""$LaunchDelegateDefault"" ;; esac fi @@ -33948,8 +34191,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$MogrifyDelegateDefault"", so it can be a program name with args. -set dummy "$MogrifyDelegateDefault"; ac_word=$2 +# Extract the first word of ""$MogrifyDelegateDefault"", so it can be a program name with args. +set dummy "$MogrifyDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_MogrifyDelegate+:} false; then : @@ -33975,7 +34218,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_MogrifyDelegate" && ac_cv_path_MogrifyDelegate=" "$MogrifyDelegateDefault"" + test -z "$ac_cv_path_MogrifyDelegate" && ac_cv_path_MogrifyDelegate=""$MogrifyDelegateDefault"" ;; esac fi @@ -33989,8 +34232,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$VIDEODecodeDelegateDefault"", so it can be a program name with args. -set dummy "$VIDEODecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$VIDEODecodeDelegateDefault"", so it can be a program name with args. +set dummy "$VIDEODecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_VIDEODecodeDelegate+:} false; then : @@ -34016,7 +34259,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_VIDEODecodeDelegate" && ac_cv_path_VIDEODecodeDelegate=" "$VIDEODecodeDelegateDefault"" + test -z "$ac_cv_path_VIDEODecodeDelegate" && ac_cv_path_VIDEODecodeDelegate=""$VIDEODecodeDelegateDefault"" ;; esac fi @@ -34030,8 +34273,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$VIDEOEncodeDelegateDefault"", so it can be a program name with args. -set dummy "$VIDEOEncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$VIDEOEncodeDelegateDefault"", so it can be a program name with args. +set dummy "$VIDEOEncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_VIDEOEncodeDelegate+:} false; then : @@ -34057,7 +34300,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_VIDEOEncodeDelegate" && ac_cv_path_VIDEOEncodeDelegate=" "$VIDEOEncodeDelegateDefault"" + test -z "$ac_cv_path_VIDEOEncodeDelegate" && ac_cv_path_VIDEOEncodeDelegate=""$VIDEOEncodeDelegateDefault"" ;; esac fi @@ -34071,8 +34314,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$MrSIDDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$MrSIDDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$MrSIDDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$MrSIDDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_MrSIDDecodeDelegate+:} false; then : @@ -34098,7 +34341,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_MrSIDDecodeDelegate" && ac_cv_path_MrSIDDecodeDelegate=" "$MrSIDDecodeDelegateDefault"" + test -z "$ac_cv_path_MrSIDDecodeDelegate" && ac_cv_path_MrSIDDecodeDelegate=""$MrSIDDecodeDelegateDefault"" ;; esac fi @@ -34112,8 +34355,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$MVDelegateDefault"", so it can be a program name with args. -set dummy "$MVDelegateDefault"; ac_word=$2 +# Extract the first word of ""$MVDelegateDefault"", so it can be a program name with args. +set dummy "$MVDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_MVDelegate+:} false; then : @@ -34139,7 +34382,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_MVDelegate" && ac_cv_path_MVDelegate=" "$MVDelegateDefault"" + test -z "$ac_cv_path_MVDelegate" && ac_cv_path_MVDelegate=""$MVDelegateDefault"" ;; esac fi @@ -34153,8 +34396,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$PCLDelegateDefault"", so it can be a program name with args. -set dummy "$PCLDelegateDefault"; ac_word=$2 +# Extract the first word of ""$PCLDelegateDefault"", so it can be a program name with args. +set dummy "$PCLDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_PCLDelegate+:} false; then : @@ -34180,7 +34423,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_PCLDelegate" && ac_cv_path_PCLDelegate=" "$PCLDelegateDefault"" + test -z "$ac_cv_path_PCLDelegate" && ac_cv_path_PCLDelegate=""$PCLDelegateDefault"" ;; esac fi @@ -34240,8 +34483,8 @@ fi done test -n "$PSDelegate" || PSDelegate=""$PSDelegateDefault"" -# Extract the first word of " "$RMDelegateDefault"", so it can be a program name with args. -set dummy "$RMDelegateDefault"; ac_word=$2 +# Extract the first word of ""$RMDelegateDefault"", so it can be a program name with args. +set dummy "$RMDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_RMDelegate+:} false; then : @@ -34267,7 +34510,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_RMDelegate" && ac_cv_path_RMDelegate=" "$RMDelegateDefault"" + test -z "$ac_cv_path_RMDelegate" && ac_cv_path_RMDelegate=""$RMDelegateDefault"" ;; esac fi @@ -34281,8 +34524,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$RSVGDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$RSVGDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$RSVGDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$RSVGDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_RSVGDecodeDelegate+:} false; then : @@ -34308,7 +34551,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_RSVGDecodeDelegate" && ac_cv_path_RSVGDecodeDelegate=" "$RSVGDecodeDelegateDefault"" + test -z "$ac_cv_path_RSVGDecodeDelegate" && ac_cv_path_RSVGDecodeDelegate=""$RSVGDecodeDelegateDefault"" ;; esac fi @@ -34322,8 +34565,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$SVGDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$SVGDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$SVGDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$SVGDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_SVGDecodeDelegate+:} false; then : @@ -34349,7 +34592,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_SVGDecodeDelegate" && ac_cv_path_SVGDecodeDelegate=" "$SVGDecodeDelegateDefault"" + test -z "$ac_cv_path_SVGDecodeDelegate" && ac_cv_path_SVGDecodeDelegate=""$SVGDecodeDelegateDefault"" ;; esac fi @@ -34363,8 +34606,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$TextEncodeDelegateDefault"", so it can be a program name with args. -set dummy "$TextEncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$TextEncodeDelegateDefault"", so it can be a program name with args. +set dummy "$TextEncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_TextEncodeDelegate+:} false; then : @@ -34390,7 +34633,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_TextEncodeDelegate" && ac_cv_path_TextEncodeDelegate=" "$TextEncodeDelegateDefault"" + test -z "$ac_cv_path_TextEncodeDelegate" && ac_cv_path_TextEncodeDelegate=""$TextEncodeDelegateDefault"" ;; esac fi @@ -34404,8 +34647,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$TraceEncodeDelegateDefault"", so it can be a program name with args. -set dummy "$TraceEncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$TraceEncodeDelegateDefault"", so it can be a program name with args. +set dummy "$TraceEncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_TraceEncodeDelegate+:} false; then : @@ -34431,7 +34674,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_TraceEncodeDelegate" && ac_cv_path_TraceEncodeDelegate=" "$TraceEncodeDelegateDefault"" + test -z "$ac_cv_path_TraceEncodeDelegate" && ac_cv_path_TraceEncodeDelegate=""$TraceEncodeDelegateDefault"" ;; esac fi @@ -34445,8 +34688,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$Fig2devDelegateDefault"", so it can be a program name with args. -set dummy "$Fig2devDelegateDefault"; ac_word=$2 +# Extract the first word of ""$Fig2devDelegateDefault"", so it can be a program name with args. +set dummy "$Fig2devDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_Fig2devDelegate+:} false; then : @@ -34472,7 +34715,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_Fig2devDelegate" && ac_cv_path_Fig2devDelegate=" "$Fig2devDelegateDefault"" + test -z "$ac_cv_path_Fig2devDelegate" && ac_cv_path_Fig2devDelegate=""$Fig2devDelegateDefault"" ;; esac fi @@ -34486,8 +34729,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$WebPDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$WebPDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$WebPDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$WebPDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_WebPDecodeDelegate+:} false; then : @@ -34513,7 +34756,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_WebPDecodeDelegate" && ac_cv_path_WebPDecodeDelegate=" "$WebPDecodeDelegateDefault"" + test -z "$ac_cv_path_WebPDecodeDelegate" && ac_cv_path_WebPDecodeDelegate=""$WebPDecodeDelegateDefault"" ;; esac fi @@ -34527,8 +34770,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$WebPEncodeDelegateDefault"", so it can be a program name with args. -set dummy "$WebPEncodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$WebPEncodeDelegateDefault"", so it can be a program name with args. +set dummy "$WebPEncodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_WebPEncodeDelegate+:} false; then : @@ -34554,7 +34797,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_WebPEncodeDelegate" && ac_cv_path_WebPEncodeDelegate=" "$WebPEncodeDelegateDefault"" + test -z "$ac_cv_path_WebPEncodeDelegate" && ac_cv_path_WebPEncodeDelegate=""$WebPEncodeDelegateDefault"" ;; esac fi @@ -34568,8 +34811,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$WWWDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$WWWDecodeDelegateDefault"; ac_word=$2 +# Extract the first word of ""$WWWDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$WWWDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_WWWDecodeDelegate+:} false; then : @@ -34595,7 +34838,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_WWWDecodeDelegate" && ac_cv_path_WWWDecodeDelegate=" "$WWWDecodeDelegateDelegateDefault"" + test -z "$ac_cv_path_WWWDecodeDelegate" && ac_cv_path_WWWDecodeDelegate=""$WWWDecodeDelegateDelegateDefault"" ;; esac fi @@ -34609,8 +34852,8 @@ $as_echo "no" >&6; } fi -# Extract the first word of " "$XPSDelegateDefault"", so it can be a program name with args. -set dummy "$XPSDelegateDefault"; ac_word=$2 +# Extract the first word of ""$XPSDelegateDefault"", so it can be a program name with args. +set dummy "$XPSDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 $as_echo_n "checking for $ac_word... " >&6; } if ${ac_cv_path_XPSDelegate+:} false; then : @@ -34636,7 +34879,7 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_XPSDelegate" && ac_cv_path_XPSDelegate=" "$XPSDelegateDefault"" + test -z "$ac_cv_path_XPSDelegate" && ac_cv_path_XPSDelegate=""$XPSDelegateDefault"" ;; esac fi @@ -34781,13 +35024,6 @@ $as_echo_n "checking for URW-base35 fonts directory... " >&6; } urw_base35_font_dir='' if test "${with_urw_base35_font_dir}" != 'default'; then urw_base35_font_dir="${with_urw_base35_font_dir}/" -else - for font_dir in "${prefix}/share/urw-base35/fonts/" '/usr/share/fonts/urw-base35/' '/usr/share/fonts/type1/urw-base35/'; do - if test -f "${font_dir}StandardSymbolsPS.t1"; then - urw_base35_font_dir="${font_dir}" - break 1 - fi - done fi if test "${urw_base35_font_dir}x" != 'x'; then type_include_files="${type_include_files} "'<include file="type-urw-base35.xml" />' @@ -35044,7 +35280,7 @@ AUTOMAKE=${AUTOMAKE-"${am_missing_run}automake"} AUTOHEADER=${AUTOHEADER-"${am_missing_run}autoheader"} - if test "x$RPM" != "x" ; then + if test "x$RPM" != "x"; then RPM_DELEGATE_TRUE= RPM_DELEGATE_FALSE='#' else @@ -35100,7 +35336,7 @@ fi done - if test "x$P7ZIP" != "x" ; then + if test "x$P7ZIP" != "x"; then P7ZIP_DELEGATE_TRUE= P7ZIP_DELEGATE_FALSE='#' else @@ -35156,7 +35392,7 @@ fi done - if test "x$ZIP" != "x" ; then + if test "x$ZIP" != "x"; then ZIP_DELEGATE_TRUE= ZIP_DELEGATE_FALSE='#' else @@ -35558,7 +35794,7 @@ $as_echo "$as_me: WARNING: could not find the perl interpreter" >&2;} fi fi - if test "$have_perl" != 'no'; then + if test "$have_perl" != 'no'; then WITH_PERL_TRUE= WITH_PERL_FALSE='#' else @@ -35566,7 +35802,7 @@ else WITH_PERL_FALSE= fi - if test $with_perl_static = 'yes'; then + if test $with_perl_static = 'yes'; then WITH_PERL_STATIC_TRUE= WITH_PERL_STATIC_FALSE='#' else @@ -35574,7 +35810,7 @@ else WITH_PERL_STATIC_FALSE= fi - if test $with_perl_dynamic = 'yes'; then + if test $with_perl_dynamic = 'yes'; then WITH_PERL_DYNAMIC_TRUE= WITH_PERL_DYNAMIC_FALSE='#' else @@ -35705,8 +35941,8 @@ fi if test "$have_xml" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES xml" fi -if test "$have_ziplib" = 'yes' ; then - MAGICK_DELEGATES="$MAGICK_DELEGATES ziplib" +if test "$have_zip" = 'yes' ; then + MAGICK_DELEGATES="$MAGICK_DELEGATES zip" fi if test "$have_zlib" = 'yes' ; then MAGICK_DELEGATES="$MAGICK_DELEGATES zlib" @@ -35851,9 +36087,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 $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 $BZLIB_LIBS $ZLIB_LIBS $ZIP_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 $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 $ZIP_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" @@ -36143,8 +36379,8 @@ if test -z "${X11_DELEGATE_TRUE}" && test -z "${X11_DELEGATE_FALSE}"; then as_fn_error $? "conditional \"X11_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi -if test -z "${ZIPLIB_DELEGATE_TRUE}" && test -z "${ZIPLIB_DELEGATE_FALSE}"; then - as_fn_error $? "conditional \"ZIPLIB_DELEGATE\" was never defined. +if test -z "${ZIP_DELEGATE_TRUE}" && test -z "${ZIP_DELEGATE_FALSE}"; then + as_fn_error $? "conditional \"ZIP_DELEGATE\" was never defined. Usually this means the macro was only invoked conditionally." "$LINENO" 5 fi if test -z "${ZLIB_DELEGATE_TRUE}" && test -z "${ZLIB_DELEGATE_FALSE}"; then @@ -36708,7 +36944,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-57, which was +This file was extended by ImageMagick $as_me 7.0.11-8, which was generated by GNU Autoconf 2.69. Invocation command line was CONFIG_FILES = $CONFIG_FILES @@ -36775,7 +37011,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-57 +ImageMagick config.status 7.0.11-8 configured by $0, generated by GNU Autoconf 2.69, with options \\"\$ac_cs_config\\" @@ -38886,7 +39122,7 @@ fi # ============================================================================== { $as_echo "$as_me:${as_lineno-$LINENO}: ============================================================================== -${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM} is configured as follows. Please verify that this +${PACKAGE_NAME} ${PACKAGE_VERSION} is configured as follows. Please verify that this configuration matches your expectations. Host system type: $host @@ -38944,7 +39180,7 @@ Delegate library configuration: WMF --with-wmf=$with_wmf $have_wmf X11 --with-x=$with_x $have_x XML --with-xml=$with_xml $have_xml - ZIP --with-ziplib=$with_ziplib $have_ziplib + ZIP --with-zip=$with_zip $have_zip ZLIB --with-zlib=$with_zlib $have_zlib ZSTD --with-zstd=$with_zstd $have_zstd @@ -38985,7 +39221,7 @@ Options used to compile and link: " >&5 $as_echo "$as_me: ============================================================================== -${PACKAGE_NAME} ${PACKAGE_VERSION}${PACKAGE_VERSION_ADDENDUM} is configured as follows. Please verify that this +${PACKAGE_NAME} ${PACKAGE_VERSION} is configured as follows. Please verify that this configuration matches your expectations. Host system type: $host @@ -39043,7 +39279,7 @@ Delegate library configuration: WMF --with-wmf=$with_wmf $have_wmf X11 --with-x=$with_x $have_x XML --with-xml=$with_xml $have_xml - ZIP --with-ziplib=$with_ziplib $have_ziplib + ZIP --with-zip=$with_zip $have_zip ZLIB --with-zlib=$with_zlib $have_zlib ZSTD --with-zstd=$with_zstd $have_zstd |