diff --git a/configure b/configure
index 0d13684..50b924a 100755
--- a/configure
+++ b/configure
@@ -728,6 +728,7 @@
CODER_PATH
LIBRARY_PATH
EXECUTABLE_PATH
+INCLUDE_PATH
PERLMAINCC
XML_LIBS
XML_DELEGATE_FALSE
@@ -8267,12 +8268,7 @@
fi
-
-cat >>confdefs.h <<_ACEOF
-#define INCLUDEDIR_ARCH "$includedir_arch"
-_ACEOF
-
-INCLUDEDIR_ARCH="$includedir_arch"
+eval "eval INCLUDEDIR_ARCH=$includedir_arch"
#
@@ -8287,11 +8283,7 @@
fi
-
-cat >>confdefs.h <<_ACEOF
-#define CONFIGDIR_ARCH "$configdir_arch"
-_ACEOF
-
+eval "eval CONFIGDIR_ARCH=$configdir_arch"
CONFIGDIR_ARCH="$configdir_arch"
@@ -31912,6 +31904,21 @@
#
# Configure install Paths
#
+# Path to ImageMagick header files
+INCLUDE_RELATIVE_PATH="ImageMagick"
+INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}"
+DEFINE_INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}/"
+case "${build_os}" in
+ mingw* )
+ DEFINE_INCLUDE_PATH=`$WinPathScript "$DEFINE_INCLUDE_PATH" 1`
+ ;;
+esac
+
+cat >>confdefs.h <<_ACEOF
+#define INCLUDE_PATH "$DEFINE_INCLUDE_PATH"
+_ACEOF
+
+
# Subdirectory under lib to place ImageMagick lib files
LIBRARY_RELATIVE_PATH="${PACKAGE_NAME}-${PACKAGE_VERSION}"
@@ -32012,14 +32019,14 @@
-# Subdirectory to place ImageMagick configuration files
+# Subdirectory to place architecture-dependent configuration files
CONFIGURE_RELATIVE_PATH="${PACKAGE_NAME}"
cat >>confdefs.h <<_ACEOF
#define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
_ACEOF
-CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${CONFIGDIR_ARCH}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
@@ -32033,7 +32040,7 @@
-# Subdirectory to place ImageMagick configuration files
+# Subdirectory to place architecture-independent configuration files
SHARE_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
cat >>confdefs.h <<_ACEOF