From cf4a3c209090759cb0b9d4c9add88b116f5497dd Mon Sep 17 00:00:00 2001 From: cristy Date: Sun, 2 Dec 2012 21:47:25 +0000 Subject: [PATCH] --- configure | 23 +++++++---------------- 1 file changed, 7 insertions(+), 16 deletions(-) diff --git a/configure b/configure index 1c3baece8..caa2e7098 100755 --- a/configure +++ b/configure @@ -884,7 +884,7 @@ MODULE_EXTRA_CPPFLAGS LIBSTDCLDFLAGS PERL_MAKE_OPTIONS MAGICK_LT_RELEASE_OPTS -MAGICK_ABI_SUFFIX +ABI_SUFFIX QUANTUM_DEPTH LEGACY_SUPPORT_FALSE LEGACY_SUPPORT_TRUE @@ -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=10080:10082M +MAGICK_SVN_REVISION=10080:10087 @@ -21005,9 +21005,9 @@ _ACEOF # define a lib suffix for abi purpose -MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}" +ABI_SUFFIX="Q${QUANTUM_DEPTH}" if test "$enable_hdri" = 'yes'; then - MAGICK_ABI_SUFFIX="Q${QUANTUM_DEPTH}-${MAGICK_HDRI}" + ABI_SUFFIX="Q${QUANTUM_DEPTH}-${MAGICK_HDRI}" fi @@ -32012,13 +32012,14 @@ _ACEOF if test "x$MODULES_DIRNAME" = "x"; then - MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX} -fi + MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${ABI_SUFFIX} +else cat >>confdefs.h <<_ACEOF #define MODULES_DIRNAME "$MODULES_DIRNAME" _ACEOF +fi MODULES_RELATIVE_PATH="${MODULES_DIRNAME}" @@ -32041,11 +32042,6 @@ _ACEOF CODER_RELATIVE_PATH="${CODER_DIRNAME}" CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}" -cat >>confdefs.h <<_ACEOF -#define CODER_PATH "$CODER_PATH" -_ACEOF - - # # Subdirectory under lib to place ImageMagick filter module files @@ -32060,11 +32056,6 @@ cat >>confdefs.h <<_ACEOF _ACEOF -cat >>confdefs.h <<_ACEOF -#define FILTER_PATH "$FILTER_PATH" -_ACEOF - - FILTER_RELATIVE_PATH="${FILTER_DIRNAME}" FILTER_PATH="${MODULES_PATH}/${FILTER_DIRNAME}" -- 2.40.0