(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index d270ee3aee96bf63eefccbcc8b8eff3ec694775b..8d9d56bdd36e7c3223edaa144b719196e8f85b82 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -1255,16 +1255,13 @@
 #define MAGICKCORE_SELECT_TYPE_ARG5 (struct timeval *)
 #endif
 
-/* Directory where architecture-independent configuration files live. */
-#ifndef MAGICKCORE_SHAREARCH_PATH
-#define MAGICKCORE_SHAREARCH_PATH "/usr/local/lib/ImageMagick-7.0.0/config/"
+/* Configure directory name without ABI part. */
+#ifndef MAGICKCORE_SHAREARCH_BASEDIRNAME
+#define MAGICKCORE_SHAREARCH_BASEDIRNAME "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/config"
-#endif
+/* Configure directory dirname */
+/* #undef SHAREARCH_DIRNAME */
 
 /* Directory where architecture-independent configuration files live. */
 #ifndef MAGICKCORE_SHARE_PATH

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 8e6855eba22047747a88de4ef6d78a4235d6a174..7ce34e49940cfc1bb29186f37ff22534eede8680 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10099M"
+#define MagickSVNRevision  "10099:10105M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  8
 #define MagickLibMinInterface  8
-#define MagickReleaseDate  "2012-12-03"
+#define MagickReleaseDate  "2012-12-04"
 #define MagickChangeDate   "20121005"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index b1cfa0adab7eace06f9f57c4fb3f98126f94a377..bfb0721f3ebace0c62f4b01ca575d0f9d7067494 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2700,8 +2700,11 @@ SBIN_DIR = @SBIN_DIR@
 SCANDecodeDelegate = @SCANDecodeDelegate@
 SED = @SED@
 SET_MAKE = @SET_MAKE@
+SHAREARCH_BASEDIRNAME = @SHAREARCH_BASEDIRNAME@
 SHAREARCH_DIR = @SHAREARCH_DIR@
+SHAREARCH_DIRNAME = @SHAREARCH_DIRNAME@
 SHAREARCH_PATH = @SHAREARCH_PATH@
+SHAREARCH_RELATIVE_PATH = @SHAREARCH_RELATIVE_PATH@
 SHAREDSTATE_DIR = @SHAREDSTATE_DIR@
 SHARE_PATH = @SHARE_PATH@
 SHELL = @SHELL@

diff --git a/config/config.h.in b/config/config.h.in
index 6446cba8a903cf3c0ced9c3d9e1abe1371dff465..aeac865ed745505310ef8eeb58b4c63bee6c14ef 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -826,12 +826,11 @@
 /* Define to the type of arg 5 for `select'. */
 #undef SELECT_TYPE_ARG5
 
-/* Directory where architecture-independent configuration files live. */
-#undef SHAREARCH_PATH
+/* Configure directory name without ABI part. */
+#undef SHAREARCH_BASEDIRNAME
 
-/* Subdirectory of lib where architecture-independent configuration files
-   live. */
-#undef SHAREARCH_RELATIVE_PATH
+/* Configure directory dirname */
+#undef SHAREARCH_DIRNAME
 
 /* Directory where architecture-independent configuration files live. */
 #undef SHARE_PATH

diff --git a/config/configure.xml.in b/config/configure.xml.in
index 2fa81580f21eb346e8f1cf95fd0e5976676a6e00..b72c5726823291d0faa0b09573a6f763c41be1a9 100644 (file)
--- a/config/configure.xml.in
+++ b/config/configure.xml.in
@@ -6,40 +6,41 @@
 <!ATTLIST configure value CDATA #REQUIRED>
 ]>
 <configuremap>
-  <configure name="NAME" value="@PACKAGE_NAME@"/>
-  <configure name="VERSION" value="@PACKAGE_VERSION@"/>
-  <configure name="LIB_VERSION" value="@PACKAGE_LIB_VERSION@"/>
-  <configure name="LIB_VERSION_NUMBER" value="@PACKAGE_LIB_VERSION_NUMBER@"/>
-  <configure name="SVN_REVISION" value="@MAGICK_SVN_REVISION@" />
-  <configure name="RELEASE_DATE" value="@PACKAGE_RELEASE_DATE@"/>
-  <configure name="CONFIGURE" value="@CONFIGURE_ARGS@"/>
-  <configure name="PREFIX" value="@PREFIX_DIR@"/>
-  <configure name="EXEC-PREFIX" value="@EXEC_PREFIX_DIR@"/>
-  <configure name="INCLUDE_PATH" value="@INCLUDE_PATH@"/>
-  <configure name="CONFIGURE_PATH" value="@CONFIGURE_PATH@"/>
-  <configure name="SHARE_PATH" value="@SHARE_PATH@"/>
-  <configure name="DOCUMENTATION_PATH" value="@DOCUMENTATION_PATH@"/>
-  <configure name="EXECUTABLE_PATH" value="@EXECUTABLE_PATH@"/>
-  <configure name="LIBRARY_PATH" value="@LIBRARY_PATH@"/>
-  <configure name="CODER_PATH" value="@CODER_PATH@"/>
-  <configure name="FILTER_PATH" value="@FILTER_PATH@"/>
   <configure name="CC" value="@CC@"/>
   <configure name="CFLAGS" value="@MAGICK_CFLAGS@"/>
+  <configure name="CODER_PATH" value="@CODER_PATH@"/>
+  <configure name="CONFIGURE_PATH" value="@CONFIGURE_PATH@"/>
+  <configure name="CONFIGURE" value="@CONFIGURE_ARGS@"/>
+  <configure name="COPYRIGHT" value="Copyright (C) 1999-2012 ImageMagick Studio LLC"/>
   <configure name="CPPFLAGS" value="@MAGICK_CPPFLAGS@"/>
-  <configure name="PCFLAGS" value="@MAGICK_PCFLAGS@"/>
+  <configure name="CXXFLAGS" value="@CXXFLAGS@"/>
+  <configure name="CXX" value="@CXX@"/>
   <configure name="DEFS" value="@DEFS@"/>
+  <configure name="DELEGATES" value="@DELEGATES@"/>
+  <configure name="DISTCHECK_CONFIG_FLAGS" value="@DISTCHECK_CONFIG_FLAGS@"/>
+  <configure name="DOCUMENTATION_PATH" value="@DOCUMENTATION_PATH@"/>
+  <configure name="EXEC-PREFIX" value="@EXEC_PREFIX_DIR@"/>
+  <configure name="EXECUTABLE_PATH" value="@EXECUTABLE_PATH@"/>
+  <configure name="FEATURES" value="@MAGICK_FEATURES@"/>
+  <configure name="FILTER_PATH" value="@FILTER_PATH@"/>
+  <configure name="HOST" value="@host@"/>
+  <configure name="INCLUDE_PATH" value="@INCLUDE_PATH@"/>
   <configure name="LDFLAGS" value="@MAGICK_LDFLAGS@"/>
+  <configure name="LIBRARY_PATH" value="@LIBRARY_PATH@"/>
   <configure name="LIBS" value="@MAGICK_LIBS@"/>
-  <configure name="CXX" value="@CXX@"/>
-  <configure name="CXXFLAGS" value="@CXXFLAGS@"/>
-  <configure name="DISTCHECK_CONFIG_FLAGS" value="@DISTCHECK_CONFIG_FLAGS@"/>
+  <configure name="LIB_VERSION_NUMBER" value="@PACKAGE_LIB_VERSION_NUMBER@"/>
+  <configure name="LIB_VERSION" value="@PACKAGE_LIB_VERSION@"/>
+  <configure name="NAME" value="@PACKAGE_NAME@"/>
+  <configure name="PCFLAGS" value="@MAGICK_PCFLAGS@"/>
+  <configure name="PREFIX" value="@PREFIX_DIR@"/>
+  <configure name="QuantumDepth" value="@QUANTUM_DEPTH@"/>
+  <configure name="RELEASE_DATE" value="@PACKAGE_RELEASE_DATE@"/>
+  <configure name="SHAREARCH_PATH" value="@SHAREARCH_PATH@"/>
+  <configure name="SHARE_PATH" value="@SHARE_PATH@"/>
+  <configure name="SVN_REVISION" value="@MAGICK_SVN_REVISION@" />
   <configure name="TARGET_CPU" value="@MAGICK_TARGET_CPU@"/>
-  <configure name="TARGET_VENDOR" value="@MAGICK_TARGET_VENDOR@"/>
   <configure name="TARGET_OS" value="@MAGICK_TARGET_OS@"/>
-  <configure name="HOST" value="@host@"/>
-  <configure name="FEATURES" value="@MAGICK_FEATURES@"/>
-  <configure name="DELEGATES" value="@DELEGATES@"/>
-  <configure name="COPYRIGHT" value="Copyright (C) 1999-2012 ImageMagick Studio LLC"/>
+  <configure name="TARGET_VENDOR" value="@MAGICK_TARGET_VENDOR@"/>
+  <configure name="VERSION" value="@PACKAGE_VERSION@"/>
   <configure name="WEBSITE" value="http://www.imagemagick.org"/>
-  <configure name="QuantumDepth" value="@QUANTUM_DEPTH@"/>
 </configuremap>

diff --git a/configure b/configure
index 2c99a7f31a93d2afbbf7f989f3d91b6614279929..0f02bcd710f358762b3b30afda63fc6dd67aeb13 100755 (executable)
--- a/configure
+++ b/configure
@@ -3649,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=10099:10103
+MAGICK_SVN_REVISION=10099:10105M