(no commit message)

diff --git a/MagickCore/magick-baseconfig.h b/MagickCore/magick-baseconfig.h
index e016e5e9bdc5d0ed33060b15e34118304f998a23..f0dd43f5d08db23c5a6e57281a6343e2499ab86f 100644 (file)
--- a/MagickCore/magick-baseconfig.h
+++ b/MagickCore/magick-baseconfig.h
@@ -35,6 +35,11 @@
 #define MAGICKCORE_CODER_DIRNAME "coders"
 #endif
 
+/* Location of coder modules */
+#ifndef MAGICKCORE_CODER_PATH
+#define MAGICKCORE_CODER_PATH "/usr/local/lib/ImageMagick-7.0.0/modules-Q16-HDRI/coders"
+#endif
+
 /* Directory where architecture-dependent configuration files live. */
 #ifndef MAGICKCORE_CONFIGURE_PATH
 #define MAGICKCORE_CONFIGURE_PATH "/usr/local/etc/ImageMagick/"
@@ -77,6 +82,11 @@
 #define MAGICKCORE_FILTER_DIRNAME "filters"
 #endif
 
+/* Location of filter modules */
+#ifndef MAGICKCORE_FILTER_PATH
+#define MAGICKCORE_FILTER_PATH ""
+#endif
+
 /* Define if you have FONTCONFIG library */
 #ifndef MAGICKCORE_FONTCONFIG_DELEGATE
 #define MAGICKCORE_FONTCONFIG_DELEGATE 1
@@ -1153,8 +1163,10 @@
 #define MAGICKCORE_MODULES_BASEDIRNAME "modules"
 #endif
 
-/* Module directory dirname (if different of default) */
-/* #undef MODULES_DIRNAME */
+/* Module directory dirname */
+#ifndef MAGICKCORE_MODULES_DIRNAME
+#define MAGICKCORE_MODULES_DIRNAME "modules-Q16-HDRI"
+#endif
 
 /* Magick API method prefix */
 /* #undef NAMESPACE_PREFIX */

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

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 6a6d1f79c623ccb93ee7271fd117e333bf8089ae..3941d044999bf08658de75079055f7b55681f801 100644 (file)
--- 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:10078M"
+#define MagickSVNRevision  "10080M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0

diff --git a/config/config.h.in b/config/config.h.in
index 5b8a025979fd0abbbb003f67e374388698cc2322..dfa383c82156f57f14f3b3e793ef0dbcb3ec6c24 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -24,6 +24,9 @@
 /* "coders subdirectory". */
 #undef CODER_DIRNAME
 
+/* Location of coder modules */
+#undef CODER_PATH
+
 /* Directory where architecture-dependent configuration files live. */
 #undef CONFIGURE_PATH
 
@@ -52,6 +55,9 @@
 /* "filter subdirectory". */
 #undef FILTER_DIRNAME
 
+/* Location of filter modules */
+#undef FILTER_PATH
+
 /* Define if you have FONTCONFIG library */
 #undef FONTCONFIG_DELEGATE
 
@@ -756,7 +762,7 @@
 /* Module directory name without ABI part. */
 #undef MODULES_BASEDIRNAME
 
-/* Module directory dirname (if different of default) */
+/* Module directory dirname */
 #undef MODULES_DIRNAME
 
 /* Magick API method prefix */

diff --git a/configure b/configure
index 64632de8d144f8c12753014c2f824ab7cd0aa89d..7004d3154bb9b0ae950350c02a72ac650540860b 100755 (executable)
--- 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:10078M
+MAGICK_SVN_REVISION=10080M
 
 
 
@@ -32014,13 +32014,13 @@ _ACEOF
 if test "x$MODULES_DIRNAME" = "x"; then
    MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
 else
-   # not defined by default
+   MODULES_DIRNAME=${MODULES_BASEDIRNAME}
+fi
 
 cat >>confdefs.h <<_ACEOF
 #define MODULES_DIRNAME "$MODULES_DIRNAME"
 _ACEOF
 
-fi
 
 
 MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
@@ -32043,6 +32043,11 @@ _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
@@ -32057,6 +32062,11 @@ 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}"

diff --git a/configure.ac b/configure.ac
index a28e77a9f1927a415f188acffadedb61728b6134..2ec523da362e635d3be07abc0a7b03521ad621ae 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -3010,9 +3010,9 @@ AC_SUBST(MODULES_BASEDIRNAME)
 if test "x$MODULES_DIRNAME" = "x"; then
    MODULES_DIRNAME=${MODULES_BASEDIRNAME}-${MAGICK_ABI_SUFFIX}
 else
-   # not defined by default 
-   AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname (if different of default))
+   MODULES_DIRNAME=${MODULES_BASEDIRNAME}
 fi
+AC_DEFINE_UNQUOTED(MODULES_DIRNAME,"$MODULES_DIRNAME",Module directory dirname)
 AC_SUBST(MODULES_DIRNAME)
 
 MODULES_RELATIVE_PATH="${MODULES_DIRNAME}"
@@ -3030,6 +3030,7 @@ 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)
 
 #
@@ -3040,6 +3041,7 @@ 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}"