https://github.com/ImageMagick/ImageMagick/issues/871

diff --git a/MagickCore/module.c b/MagickCore/module.c
index e1aeb8170d3866f72acfba6cce016e0c119362aa..627e1d3ea07bc68641d0165048a4250da5e2eeac 100644 (file)
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -1002,7 +1002,7 @@ MagickExport MagickBooleanType InvokeDynamicImageFilter(const char *tag,
   (void) FormatLocaleString(name,MagickPathExtent,"%sImage",tag);
 #else
   (void) FormatLocaleString(name,MagickPathExtent,"%s%sImage",
-    MAGICKCORE_NAMESPACE_PREFIX,tag);
+    MAGICKCORE_NAMESPACE_PREFIX_TAG,tag);
 #endif
   /*
     Execute the module.
@@ -1559,7 +1559,7 @@ static void TagToModuleName(const char *tag,const char *format,char *module)
       prefix_format[MagickPathExtent];
 
     (void) FormatLocaleString(prefix_format,MagickPathExtent,"%s%s",
-      MAGICKCORE_NAMESPACE_PREFIX,format);
+      MAGICKCORE_NAMESPACE_PREFIX_TAG,format);
     (void) FormatLocaleString(module,MagickPathExtent,prefix_format,name);
   }
 #endif

diff --git a/config/config.h.in b/config/config.h.in
index b13b934d109eac0b3f7240d97214005a3d2d451a..d02165ebc25a9479110623d5563d0e9ecff5ec2f 100644 (file)
--- a/config/config.h.in
+++ b/config/config.h.in
@@ -793,6 +793,9 @@
 /* Magick API method prefix */
 #undef NAMESPACE_PREFIX
 
+/* Magick API method prefix tag */
+#undef NAMESPACE_PREFIX_TAG
+
 /* Define to 1 if assertions should be disabled. */
 #undef NDEBUG
 

diff --git a/configure b/configure
index 1e99c5e613558c5338589649068782df87f58fb4..c4a2d3db4e9e6a2bcc60e8b9413f88a28fbb44cb 100755 (executable)
--- a/configure
+++ b/configure
@@ -4559,7 +4559,7 @@ MAGICK_PATCHLEVEL_VERSION=12
 
 MAGICK_VERSION=7.0.7-12
 
-MAGICK_GIT_REVISION=21710:6714d07f3:20171120
+MAGICK_GIT_REVISION=21711:b01d2581c:20171120
 
 
 # Substitute library versioning
@@ -24536,6 +24536,11 @@ cat >>confdefs.h <<_ACEOF
 #define NAMESPACE_PREFIX $with_method_prefix
 _ACEOF
 
+
+cat >>confdefs.h <<_ACEOF
+#define NAMESPACE_PREFIX_TAG "$with_method_prefix"
+_ACEOF
+
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
 fi
 

diff --git a/configure.ac b/configure.ac
index 6e666add7921dba6c0d307afb08fc3d185501798..ac37dad7a7401c0cd815f86c16ab9d5d16698cbd 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -771,6 +771,7 @@ AC_ARG_WITH([method-prefix],
 
 if test "$with_method_prefix" != 'no'; then
     AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX,$with_method_prefix,[Magick API method prefix])
+    AC_DEFINE_UNQUOTED(NAMESPACE_PREFIX_TAG,["$with_method_prefix"],[Magick API method prefix tag])
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-method-prefix "
 fi