From 371d4811463c75ed034b6c445c84b9c79c3c55ea Mon Sep 17 00:00:00 2001 From: cristy Date: Sat, 1 Dec 2012 19:48:10 +0000 Subject: [PATCH] --- MagickCore/version.h | 2 +- configure | 8 ++++---- configure.ac | 8 ++++---- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/MagickCore/version.h b/MagickCore/version.h index 45ee75b6d..a3dbe407a 100644 --- a/MagickCore/version.h +++ b/MagickCore/version.h @@ -27,7 +27,7 @@ extern "C" { */ #define MagickPackageName "ImageMagick" #define MagickCopyright "Copyright (C) 1999-2012 ImageMagick Studio LLC" -#define MagickSVNRevision "10062:10071M" +#define MagickSVNRevision "10062:10076M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 10,0,0 diff --git a/configure b/configure index 72e629a4c..c4ac975b1 100755 --- a/configure +++ b/configure @@ -3646,7 +3646,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=10062:10071M +MAGICK_SVN_REVISION=10062:10076M @@ -32021,7 +32021,7 @@ _ACEOF fi -MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}" +MODULES_RELATIVE_PATH="${MODULES_DIRNAME}" MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}" @@ -32038,7 +32038,7 @@ _ACEOF -CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}" +CODER_RELATIVE_PATH="${CODER_DIRNAME}" CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}" @@ -32056,7 +32056,7 @@ _ACEOF -FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}" +FILTER_RELATIVE_PATH="${FILTER_DIRNAME}" FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}" diff --git a/configure.ac b/configure.ac index 32f349ee1..7fe54adc4 100755 --- a/configure.ac +++ b/configure.ac @@ -3009,11 +3009,11 @@ if test "x$MODULES_DIRNAME" = "x"; then MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABISUFFIX} else # not defined by default - AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default)") + AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default)) fi AC_SUBST(MODULES_DIRNAME) -MODULES_RELATIVE_PATH="${LIBRARY_RELATIVE_PATH}/${MODULES_DIRNAME}" +MODULES_RELATIVE_PATH="${MODULES_DIRNAME}" AC_SUBST(MODULES_RELATIVE_PATH) MODULES_PATH="${LIBRARY_PATH}/${MODULES_RELATIVE_PATH}" AC_SUBST(MODULES_PATH) @@ -3026,7 +3026,7 @@ fi AC_DEFINE_UNQUOTED(CODER_DIRNAME,"$CODER_DIRNAME","coders subdirectory".) AC_SUBST(CODER_DIRNAME) -CODER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${CODER_DIRNAME}" +CODER_RELATIVE_PATH="${CODER_DIRNAME}" CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}" AC_SUBST(CODER_PATH) @@ -3040,7 +3040,7 @@ fi AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME","filter subdirectory".) AC_SUBST(FILTER_DIRNAME) -FILTER_RELATIVE_PATH="${MODULES_RELATIVE_PATH}/${FILTER_DIRNAME}" +FILTER_RELATIVE_PATH="${FILTER_DIRNAME}" FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}" AC_SUBST(FILTER_PATH) -- 2.40.0