diff --git a/configure b/configure
index 316eef1..f014b33 100755
--- a/configure
+++ b/configure
@@ -748,6 +748,7 @@
MODULES_BASEDIRNAME
LIBRARY_PATH
EXECUTABLE_PATH
+INCLUDEARCH_PATH
INCLUDE_PATH
PERLMAINCC
XML_LIBS
@@ -3649,7 +3650,7 @@
MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
-MAGICK_SVN_REVISION=10405:10419M
+MAGICK_SVN_REVISION=10464M
@@ -20844,12 +20845,19 @@
MAGICK_HDRI=""
if test "$enable_hdri" = 'yes'; then
MAGICK_HDRI="HDRI"
-
-$as_echo "#define HDRI_SUPPORT 1" >>confdefs.h
-
+ magick_hdri_enable='1';
MAGICK_FEATURES="HDRI $MAGICK_FEATURES"
+else
+ magick_hdri_enable='0'
fi
+cat >>confdefs.h <<_ACEOF
+#define HDRI_ENABLE_OBSOLETE_IN_H $magick_hdri_enable
+_ACEOF
+
+MAGICK_PCFLAGS="$MAGICK_PCFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
+CFLAGS="$CFLAGS -DMAGICKCORE_HDRI_ENABLE=$magick_hdri_enable"
+
# Build a version of ImageMagick with assert statements.
# Check whether --enable-assert was given.
if test "${enable_assert+set}" = set; then :
@@ -21003,9 +21011,11 @@
QUANTUM_DEPTH="$with_quantum_depth"
cat >>confdefs.h <<_ACEOF
-#define QUANTUM_DEPTH $QUANTUM_DEPTH
+#define QUANTUM_DEPTH_OBSOLETE_IN_H $QUANTUM_DEPTH
_ACEOF
+MAGICKCORE_PCFLAGS="$MAGICKCORE_PCFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
+CFLAGS="$CFLAGS -DMAGICKCORE_QUANTUM_DEPTH=$QUANTUM_DEPTH"
# define a lib suffix for abi purpose
MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}"
@@ -31894,8 +31904,8 @@
# Path to ImageMagick header files
INCLUDE_RELATIVE_PATH="ImageMagick"
-INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}"
-DEFINE_INCLUDE_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}/"
+INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}"
+DEFINE_INCLUDE_PATH="${INCLUDE_DIR}/${INCLUDE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1`
@@ -31908,6 +31918,21 @@
+# Path to ImageMagick header files (arch part)
+INCLUDEARCH_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}"
+DEFINE_INCLUDEARCH_PATH="${INCLUDEARCH_DIR}/${INCLUDE_RELATIVE_PATH}/"
+case "${build_os}" in
+ mingw* )
+ DEFINE_INCLUDEARCH_PATH=`$WinPathScript "$DEFINE_INCLUDEARCH_PATH" 1`
+ ;;
+esac
+
+cat >>confdefs.h <<_ACEOF
+#define INCLUDEARCH_PATH "$DEFINE_INCLUDE_PATH"
+_ACEOF
+
+
+
# Subdirectory under lib to place ImageMagick lib files
LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"