(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index bd6180dae1cd2c61fd7051cd6de1433667de14fb..46a194b7716b95f14a5f9cf9e1ba12e2fea6fc50 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -42,6 +42,11 @@
 #define MAGICKCORE_CODER_RELATIVE_PATH "ImageMagick-7.0.0/modules-Q16/coders"
 #endif
 
+/* ARCH specific config directory */
+#ifndef MAGICKCORE_CONFIGDIR_ARCH
+#define MAGICKCORE_CONFIGDIR_ARCH "/usr/local/lib/ImageMagick-7.0.0"
+#endif
+
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
 #define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick/"
@@ -1165,6 +1170,11 @@
 /* Define if you have umem memory allocation library */
 /* #undef HasUMEM */
 
+/* ARCH specific include directory */
+#ifndef MAGICKCORE_INCLUDEDIR_ARCH
+#define MAGICKCORE_INCLUDEDIR_ARCH "/usr/local/include"
+#endif
+
 /* ImageMagick is formally installed under prefix */
 #ifndef MAGICKCORE_INSTALLED_SUPPORT
 #define MAGICKCORE_INSTALLED_SUPPORT 1

diff --git a/MagickCore/version.h b/MagickCore/version.h
index fbe2d961e27502ce91c52e80034795647ba113c0..e0f37e917dc0af31c7702a1c637503cbe2d73855 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -34,7 +34,7 @@ extern "C" {
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2011-10-26"
+#define MagickReleaseDate  "2011-10-27"
 #define MagickChangeDate   "20110801"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/PerlMagick/Magick.pm b/PerlMagick/Magick.pm
index a98e3250a97f44fce6561f4bf0eedad8095e969b..dfdba0a46310907be0050b3cbf6e34d346585a6e 100644 (file)
--- a/PerlMagick/Magick.pm
+++ b/PerlMagick/Magick.pm
@@ -1,7 +1,21 @@
 package Image::Magick;
 
-# Released Feb. 17, 1997  by Kyle Shorter (magick@wizards.dupont.com)
-# Public Domain
+#  Copyright 1999-2011 ImageMagick Studio LLC, a non-profit organization
+#  dedicated to making software imaging solutions freely available.
+#
+#  You may not use this file except in compliance with the License.  You may
+#  obtain a copy of the License at
+#
+#    http://www.imagemagick.org/script/license.php
+#
+#  Unless required by applicable law or agreed to in writing, software
+#  distributed under the License is distributed on an "AS IS" BASIS,
+#  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+#  See the License for the specific language governing permissions and
+#  limitations under the License.
+#
+#  Initial version, written by Kyle Shorter.
+
 
 use strict;
 use Carp;

diff --git a/config/config.h.in b/config/config.h.in
index ea5cf288fbe311f98ff87a4bdcb682f12d008cc4..3761604f5112089a409e7f016adabca94d961890 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -27,6 +27,9 @@
 /* Subdirectory of lib where coder modules are installed */
 #undef CODER_RELATIVE_PATH
 
+/* ARCH specific config directory */
+#undef CONFIGDIR_ARCH
+
 /* Directory where architecture-dependent configuration files live. */
 #undef CONFIGURE_PATH
 
@@ -764,6 +767,9 @@
 /* Define if you have umem memory allocation library */
 #undef HasUMEM
 
+/* ARCH specific include directory */
+#undef INCLUDEDIR_ARCH
+
 /* ImageMagick is formally installed under prefix */
 #undef INSTALLED_SUPPORT
 

diff --git a/config/configure.xml b/config/configure.xml
index dd283f07b96a076220b7449369ba5fee2b3eb07b..a3ff780e96e67e96c24542a156ea91a2fedf3376 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -11,7 +11,7 @@
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
   <configure name="SVN_REVISION" value="5750" />
-  <configure name="RELEASE_DATE" value="2011-10-26"/>
+  <configure name="RELEASE_DATE" value="2011-10-27"/>
   <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 cd1bbaf67ae4f29c8f12ea21ade4aa406ef7cb50..e4b262f2ca5c0afb9b0744bd28e9f759c3af14d2 100755 (executable)
--- a/configure
+++ b/configure
@@ -1087,6 +1087,8 @@ with_threads
 enable_openmp
 enable_opencl
 enable_largefile
+with_includedir_arch
+with_configdir_arch
 enable_shared
 enable_static
 with_pic
@@ -1851,6 +1853,8 @@ Optional Packages:
   --with-dmalloc          use dmalloc, as in
                          http://www.dmalloc.com/dmalloc.tar.gz
   --without-threads       disable threads support
+  --includedir-arch=DIR   ARCH specific include directory
+  --configdir-arch=DIR    ARCH specific config directory
   --with-pic              try to use only PIC/non-PIC objects [default=use
                           both]
   --with-sysroot=DIR Search for dependent libraries within DIR
@@ -9712,6 +9716,42 @@ fi
 fi
 
 
+#
+# ARCH specific include directory
+#
+
+# Check whether --with-includedir-arch was given.
+if test "${with_includedir_arch+set}" = set; then :
+  withval=$with_includedir_arch; includedir_arch=$withval
+else
+  includedir_arch=$INCLUDE_DIR
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define INCLUDEDIR_ARCH "$includedir_arch"
+_ACEOF
+
+
+#
+# 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
+else
+  configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"
+fi
+
+
+
+cat >>confdefs.h <<_ACEOF
+#define CONFIGDIR_ARCH "$configdir_arch"
+_ACEOF
+
+
 #
 # Configure libtool & libltdl
 #

diff --git a/configure.ac b/configure.ac
index ffa8958565e4bbe08040c3b97c422a4e71a5da06..2a581bf00665a5c07f9f2216cf002aaf444090b2 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -459,6 +459,28 @@ if test "$enable_largefile" != no; then
 fi
 AC_SUBST(LFS_CPPFLAGS)
 
+#
+# ARCH specific include directory
+#
+AC_ARG_WITH([includedir-arch],
+    [AC_HELP_STRING([--includedir-arch=DIR],
+                    [ARCH specific include directory])],
+                    [includedir_arch=$withval],
+                    [includedir_arch=$INCLUDE_DIR])
+
+AC_DEFINE_UNQUOTED(INCLUDEDIR_ARCH,"$includedir_arch",[ARCH specific include directory])
+
+#
+# ARCH specific configuration directory
+#
+AC_ARG_WITH([configdir-arch],
+    [AC_HELP_STRING([--configdir-arch=DIR],
+                    [ARCH specific config directory])],
+                    [configdir_arch=$withval],
+                    [configdir_arch="${LIB_DIR}/${PACKAGE_NAME}-${PACKAGE_VERSION}"])
+
+AC_DEFINE_UNQUOTED(CONFIGDIR_ARCH,"$configdir_arch",[ARCH specific config directory])
+
 #
 # Configure libtool & libltdl
 #
@@ -2720,7 +2742,7 @@ dnl ===========================================================================
 #
 # Set Windows font directory.
 #
-AC_ARG_WITH(windows-font-dir,
+AC_ARG_WITH([windows-font-dir],
     [AC_HELP_STRING([--with-windows-font-dir=DIR],
                     [directory containing MS-Windows fonts])],
                     [with_windows_font_dir=$withval],