diff --git a/configure b/configure
index 50b924a..882fb02 100755
--- a/configure
+++ b/configure
@@ -918,7 +918,7 @@
PTHREAD_LIBS
PTHREAD_CC
ax_pthread_config
-CONFIGDIR_ARCH
+SHAREDIR_ARCH
INCLUDEDIR_ARCH
WinPathScript
USING_CL_FALSE
@@ -1087,7 +1087,7 @@
enable_bounds_checking
enable_osx_universal_binary
with_includedir_arch
-with_configdir_arch
+with_sharedir_arch
with_threads
enable_openmp
enable_opencl
@@ -1856,7 +1856,7 @@
--with-dmalloc use dmalloc, as in
http://www.dmalloc.com/dmalloc.tar.gz
--includedir-arch=DIR ARCH specific include directory
- --configdir-arch=DIR ARCH specific config directory
+ --sharedir-arch=DIR ARCH specific config directory
--without-threads disable threads support
--with-pic try to use only PIC/non-PIC objects [default=use
both]
@@ -8275,16 +8275,16 @@
# ARCH specific configuration directory
#
-# Check whether --with-configdir-arch was given.
-if test "${with_configdir_arch+set}" = set; then :
- withval=$with_configdir_arch; configdir_arch=$withval
+# Check whether --with-sharedir-arch was given.
+if test "${with_sharedir_arch+set}" = set; then :
+ withval=$with_sharedir_arch; sharedir_arch=$withval
else
- configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+ sharedir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
fi
-eval "eval CONFIGDIR_ARCH=$configdir_arch"
-CONFIGDIR_ARCH="$configdir_arch"
+eval "eval SHAREDIR_ARCH=$sharedir_arch"
+SHAREDIR_ARCH="$sharedir_arch"
#
@@ -31904,6 +31904,7 @@
#
# Configure install Paths
#
+
# Path to ImageMagick header files
INCLUDE_RELATIVE_PATH="ImageMagick"
INCLUDE_PATH="${INCLUDEDIR_ARCH}/${INCLUDE_RELATIVE_PATH}"
@@ -32026,7 +32027,7 @@
#define CONFIGURE_RELATIVE_PATH "$CONFIGURE_RELATIVE_PATH"
_ACEOF
-CONFIGURE_PATH="${CONFIGDIR_ARCH}/${CONFIGURE_RELATIVE_PATH}/"
+CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
DEFINE_CONFIGURE_PATH="${SYSCONF_DIR}/${CONFIGURE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )
@@ -32047,7 +32048,7 @@
#define SHARE_RELATIVE_PATH "$SHARE_RELATIVE_PATH"
_ACEOF
-SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}"
+SHARE_PATH="${SHAREDIR-ARCH}/${SHARE_RELATIVE_PATH}"
DEFINE_SHARE_PATH="${DATA_DIR}/${SHARE_RELATIVE_PATH}/"
case "${build_os}" in
mingw* )