(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index 9617f01577d28dc7fdd1b166f23329311eaa3d47..a3dafee3ae4ba9bcfb60887c5593bc470197290f 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -1362,13 +1362,13 @@
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHAREARCH_PATH
-#define MAGICKCORE_SHAREARCH_PATH "/usr/local/share/ImageMagick-7.0.0/"
+#define MAGICKCORE_SHAREARCH_PATH "/usr/local/lib/ImageMagick-7.0.0/config/"
 #endif
 
 /* Subdirectory of lib where architecture-independent configuration files
    live. */
 #ifndef MAGICKCORE_SHAREARCH_RELATIVE_PATH
-#define MAGICKCORE_SHAREARCH_RELATIVE_PATH "ImageMagick-7.0.0"
+#define MAGICKCORE_SHAREARCH_RELATIVE_PATH "ImageMagick-7.0.0/config"
 #endif
 
 /* Directory where architecture-independent configuration files live. */

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 91ea5b061158f19fe617d4cf71cdbdb2f62f3923..c6c5afb84df39b9b19e797920a6ab490107fed05 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "5861"
+#define MagickSVNRevision  "5951"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-11-05"
+#define MagickReleaseDate  "2011-11-13"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index c6e861eea90f28115c09bad37e93a41b5da33cc0..9a7305730b51c01b86a7106c5f13bc60219aee80 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2782,7 +2782,7 @@ configshare_DATA = \
        config/locale.xml
 
 
-# Where architecture-independent configuration files get installed
+# Where architecture-dependent configuration files get installed
 # (share/arch/ImageMagick-version)
 configsharearchdir = $(SHAREARCH_PATH)
 configsharearch_DATA = \

diff --git a/config/Makefile.am b/config/Makefile.am
index 9e4bc04c3b1323c8926a6eae103d2c1347bbb116..1b5279ec1bcf1ca163c097bbb47ab51cd97e4282 100644 (file)
--- a/config/Makefile.am
+++ b/config/Makefile.am
@@ -22,7 +22,7 @@ configshare_DATA = \
        config/francais.xml \
        config/locale.xml
 
-# Where architecture-independent configuration files get installed
+# Where architecture-dependent configuration files get installed
 # (share/arch/ImageMagick-version)
 configsharearchdir = $(SHAREARCH_PATH)
 configsharearch_DATA = \

diff --git a/config/configure.xml b/config/configure.xml
index 6265e499b5d65d51a8505798ebdcd113b119d8b1..29582a8b54f2bc0a1b6f08b1f91db4be39449007 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="5861" />
-  <configure name="RELEASE_DATE" value="2011-11-05"/>
+  <configure name="SVN_REVISION" value="5951" />
+  <configure name="RELEASE_DATE" value="2011-11-13"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index 98c8bf781d2e183aded32db896cd3d80d34003b9..5ae82f1557e3a434ba5b8a4684d467421d8bf068 100755 (executable)
--- a/configure
+++ b/configure
@@ -3604,7 +3604,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=5861
+MAGICK_SVN_REVISION=5951
 
 
 
@@ -8280,7 +8280,7 @@ eval "eval INCLUDEARCH_DIR=$includearch_dir"
 if test "${with_sharearch_dir+set}" = set; then :
   withval=$with_sharearch_dir; sharearch_dir=$withval
 else
-  sharearch_dir="${DATA_DIR}"
+  sharearch_dir="${LIB_DIR}"
 fi
 
 
@@ -30282,8 +30282,6 @@ PANGO_PKG=""
 if test "x$with_pango" = "xyes"; then
     { $as_echo "$as_me:${as_lineno-$LINENO}: result: -------------------------------------------------------------" >&5
 $as_echo "-------------------------------------------------------------" >&6; }
-    { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO support " >&5
-$as_echo_n "checking for PANGO support ... " >&6; }
 
 pkg_failed=no
 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for PANGO" >&5
@@ -32065,15 +32063,15 @@ _ACEOF
 
 
 
-# Subdirectory to place architecture-independent configuration files
-SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+# Subdirectory to place architecture-dependent configuration files
+SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
 
 cat >>confdefs.h <<_ACEOF
 #define SHAREARCH_RELATIVE_PATH "$SHAREARCH_RELATIVE_PATH"
 _ACEOF
 
-SHAREARCH_PATH="${DATA_DIR}/${SHAREARCH_RELATIVE_PATH}"
-DEFINE_SHAREARCH_PATH="${DATA_DIR}/${SHAREARCH_RELATIVE_PATH}/"
+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`

diff --git a/configure.ac b/configure.ac
index 851493d6f334546341406ddabba7bdbe18340544..a7658ca7651dd4e1a652593d4508b5cacaee5bd3 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -395,7 +395,7 @@ AC_ARG_WITH([sharearch-dir],
     [AC_HELP_STRING([--sharearch-dir=DIR],
                     [ARCH specific config directory])],
                     [sharearch_dir=$withval],
-                    [sharearch_dir="${DATA_DIR}"])
+                    [sharearch_dir="${LIB_DIR}"])
 
 eval "eval SHAREARCH_DIR=$sharearch_dir"
 SHAREARCH_DIR="$sharearch_dir"
@@ -2978,11 +2978,11 @@ esac
 AC_DEFINE_UNQUOTED(SHARE_PATH,"$DEFINE_SHARE_PATH",Directory where architecture-independent configuration files live.)
 AC_SUBST(SHARE_PATH)
 
-# Subdirectory to place architecture-independent configuration files
-SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}"
+# Subdirectory to place architecture-dependent configuration files
+SHAREARCH_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/config"
 AC_DEFINE_UNQUOTED(SHAREARCH_RELATIVE_PATH,"$SHAREARCH_RELATIVE_PATH",Subdirectory of lib where architecture-independent configuration files live.)
-SHAREARCH_PATH="${DATA_DIR}/${SHAREARCH_RELATIVE_PATH}"
-DEFINE_SHAREARCH_PATH="${DATA_DIR}/${SHAREARCH_RELATIVE_PATH}/"
+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`