(no commit message)

diff --git a/MagickCore/magick-config.h b/MagickCore/magick-config.h
index d81da087a2cd4bf9655b23b32548659b4fd160d5..4e9e9661f0cb8168aadd3d7d9ba0e2cf9b059393 100644 (file)
--- a/MagickCore/magick-config.h
+++ b/MagickCore/magick-config.h
@@ -36,7 +36,7 @@ extern "C" {
 #define MAGICKCORE_STRING_XQUOTE(str) MAGICKCORE_STRING_QUOTE(str)
 
 /*  ABI SUFFIX */
-#ifndef HDRI_SUPPORT
+#ifndef MAGICKCORE_HDRI_SUPPORT
 #define MAGICKCORE_ABI_SUFFIX  "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH)
 #else 
 #define MAGICKCORE_ABI_SUFFIX "Q" MAGICKCORE_STRING_XQUOTE(MAGICKCORE_QUANTUM_DEPTH) "-HDRI"

diff --git a/MagickCore/module.c b/MagickCore/module.c
index 69a15c1a503e75b469138b8efca96fe19d749710..e49bd6ad8ec0e9efcfcc5ad7d023d95ebc028098 100644 (file)
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -766,9 +766,8 @@ static MagickBooleanType GetMagickModulePath(const char *filename,
       }
       (void) CopyMagickString(prefix,GetClientPath(),MaxTextExtent);
       ChopPathComponents(prefix,1);
-      (void) FormatLocaleString(path,MaxTextExtent,
-        "%s/lib/%s/%s/%s/%s",prefix,MAGICKCORE_LIBRARY_RELATIVE_PATH,
-        MAGICKCORE_MODULES_DIRNAME,directory,filename);
+      (void) FormatLocaleString(path,MaxTextExtent,"%s/lib/%s/%s/%s",prefix,
+        MAGICKCORE_MODULES_RELATIVE_PATH,directory,filename);
 #endif
       if (IsPathAccessible(path) != MagickFalse)
         return(MagickTrue);

diff --git a/config/ImageMagick.rc b/config/ImageMagick.rc
index f90a3c63bbf240e31f7344134009353304aec3a4..b2eaf7d48871f92fa9a1489175e2f2af2301ed73 100644 (file)
--- a/config/ImageMagick.rc
+++ b/config/ImageMagick.rc
@@ -1,6 +1,6 @@
 #include "winver.h"
 #define __WINDOWS__
-#include "..\\..\\MagickCore\\magick-config.h"
+#include "..\\..\\MagickCore\\magick-baseconfig.h"
 #include "..\\..\\MagickCore\\version.h"
 
 /////////////////////////////////////////////////////////////////////////////

diff --git a/configure.ac b/configure.ac
index afb011749a5451aac998f539675d89699b987be4..607a7cea5f9719a8f8b049ebc55abee559d4b9b8 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -714,11 +714,11 @@ AC_DEFINE_UNQUOTED(QUANTUM_DEPTH,$QUANTUM_DEPTH,[Number of bits in a pixel Quant
 AC_SUBST(QUANTUM_DEPTH)dnl
 
 # 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
-AC_SUBST(MAGICK_ABI_SUFFIX)
+AC_SUBST(ABI_SUFFIX)
 
 # Set pixel cache threshold
 AC_ARG_WITH([cache],
@@ -3008,9 +3008,10 @@ AC_DEFINE_UNQUOTED(MODULES_BASEDIRNAME,"$MODULES_BASEDIRNAME",Module directory n
 AC_SUBST(MODULES_BASEDIRNAME)
 
 if test "x$MODULES_DIRNAME" = "x"; then
-   MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
+   MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${ABI_SUFFIX}
+else
+  AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname)
 fi
-AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname)
 AC_SUBST(MODULES_DIRNAME)
 
 MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
@@ -3028,7 +3029,6 @@ AC_SUBST(CODER_DIRNAME)
 
 CODER_RELATIVE_PATH="${CODER_DIRNAME}"
 CODER_PATH="${MODULES_PATH}/${CODER_DIRNAME}"
-AC_DEFINE_UNQUOTED(CODER_PATH,"$CODER_PATH",Location of coder modules)
 AC_SUBST(CODER_PATH)
 
 #
@@ -3039,7 +3039,6 @@ if test "x$FILTER_DIRNAME" = "x"; then
    FILTER_DIRNAME="filters"
 fi
 AC_DEFINE_UNQUOTED(FILTER_DIRNAME,"$FILTER_DIRNAME","filter subdirectory".)
-AC_DEFINE_UNQUOTED(FILTER_PATH,"$FILTER_PATH",Location of filter modules)
 AC_SUBST(FILTER_DIRNAME)
 
 FILTER_RELATIVE_PATH="${FILTER_DIRNAME}"