(no commit message)

diff --git a/configure b/configure
index d82271732bae2b3070f078f560f9e2ee7b86c922..2c99a7f31a93d2afbbf7f989f3d91b6614279929 100755 (executable)
--- a/configure
+++ b/configure
@@ -732,6 +732,9 @@ BZIPDelegate
 BlenderDecodeDelegate
 AutotraceDecodeDelegate
 SHAREARCH_PATH
+SHAREARCH_RELATIVE_PATH
+SHAREARCH_DIRNAME
+SHAREARCH_BASEDIRNAME
 SHARE_PATH
 CONFIGURE_PATH
 DOCUMENTATION_PATH
@@ -3646,7 +3649,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=10099M
+MAGICK_SVN_REVISION=10099:10103
 
 
 
@@ -32120,25 +32123,32 @@ _ACEOF
 
 
 
-# Subdirectory to place architecture-dependent configuration files
-SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
+#
+# Subdirectory to place architecture-dependent configuration files.
+if test "x$SHAREARCH_BASEDIRNAME" = "x"; then
+   SHAREARCH_BASEDIRNAME="config"
+fi
 
 cat >>confdefs.h <<_ACEOF
-#define SHAREARCH_RELATIVE_PATH "$SHAREARCH_RELATIVE_PATH"
+#define SHAREARCH_BASEDIRNAME "$SHAREARCH_BASEDIRNAME"
 _ACEOF
 
-SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}"
-DEFINE_SHAREARCH_PATH="${SHAREARCH_DIR}/${SHAREARCH_RELATIVE_PATH}/"
-case "${build_os}" in
-  mingw* )
-    DEFINE_SHAREARCH_PATH=`$WinPathScript "$DEFINE_SHAREARCH_PATH" 1`
-    ;;
-esac
+
+
+if test "x$SHAREARCH_DIRNAME" = "x"; then
+  SHAREARCH_DIRNAME=${SHAREARCH_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
+else
 
 cat >>confdefs.h <<_ACEOF
-#define SHAREARCH_PATH "$DEFINE_SHAREARCH_PATH"
+#define SHAREARCH_DIRNAME "$SHAREARCH_DIRNAME"
 _ACEOF
 
+fi
+
+
+SHAREARCH_RELATIVE_PATH="${SHAREARCH_DIRNAME}"
+
+SHAREARCH_PATH="${LIBRARY_PATH}/${SHAREARCH_RELATIVE_PATH}"
 
 
 #