From 408ebcdc577966b4654568e2b038ab76be88731a Mon Sep 17 00:00:00 2001 From: cristy Date: Mon, 14 Nov 2011 01:36:57 +0000 Subject: [PATCH] --- MagickCore/magick-config.h | 4 ++-- MagickCore/version.h | 4 ++-- Makefile.in | 2 +- config/Makefile.am | 2 +- config/configure.xml | 4 ++-- configure | 14 ++++++-------- configure.ac | 10 +++++----- 7 files changed, 19 insertions(+), 21 deletions(-) diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h index 9617f0157..a3dafee3a 100644 --- 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 91ea5b061..c6c5afb84 100644 --- 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 c6e861eea..9a7305730 100644 --- 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 9e4bc04c3..1b5279ec1 100644 --- 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 6265e499b..29582a8b5 100644 --- a/config/configure.xml +++ b/config/configure.xml @@ -10,8 +10,8 @@ - - + + diff --git a/configure b/configure index 98c8bf781..5ae82f155 100755 --- 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 851493d6f..a7658ca76 100755 --- 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` -- 2.40.0