From 74554efadb62d7c46a2719ab8ba2d8f24c009404 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 27 Oct 2011 12:56:11 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 10 ++++++++++ MagickCore/version.h | 2 +- PerlMagick/Magick.pm | 18 +++++++++++++++-- config/config.h.in | 6 ++++++ config/configure.xml | 2 +- configure | 40 ++++++++++++++++++++++++++++++++++++++ configure.ac | 24 ++++++++++++++++++++++- 7 files changed, 97 insertions(+), 5 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index bd6180dae..46a194b77 100644 --- 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 fbe2d961e..e0f37e917 100644 --- 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 a98e3250a..dfdba0a46 100644 --- 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 ea5cf288f..3761604f5 100644 --- 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 dd283f07b..a3ff780e9 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -11,7 +11,7 @@ - + diff --git a/configure b/configure index cd1bbaf67..e4b262f2c 100755 --- 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 ffa895856..2a581bf00 100755 --- 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], -- 2.40.0