From: Cristy <urban-warrior@imagemagick.org>
Date: Sat, 16 Dec 2017 18:42:00 +0000 (-0500)
Subject: Revert https://github.com/ImageMagick/ImageMagick/pull/895
X-Git-Tag: 7.0.7-15~2
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=82be28dfe524209efb95eadd5be6c12b2f1a31ba;p=imagemagick

Revert https://github.com/ImageMagick/ImageMagick/pull/895
---

diff --git a/MagickCore/module.c b/MagickCore/module.c
index 24af3da26..a6202a9a4 100644
--- a/MagickCore/module.c
+++ b/MagickCore/module.c
@@ -77,7 +77,7 @@ typedef void *ModuleHandle;
   Define declarations.
 */
 #if defined(MAGICKCORE_LTDL_DELEGATE)
-#  define ModuleGlobExpression "*" MAGICKCORE_LTDL_MODULE_EXT
+#  define ModuleGlobExpression "*.la"
 #else
 #  if defined(_DEBUG)
 #    define ModuleGlobExpression "IM_MOD_DB_*.dll"
@@ -1455,7 +1455,7 @@ static void TagToCoderModuleName(const char *tag,char *name)
   (void) LogMagickEvent(TraceEvent,GetMagickModule(),"%s",tag);
   assert(name != (char *) NULL);
 #if defined(MAGICKCORE_LTDL_DELEGATE)
-  (void) FormatLocaleString(name,MagickPathExtent,"%s" MAGICKCORE_LTDL_MODULE_EXT,tag);
+  (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag);
   (void) LocaleLower(name);
 #else
 #if defined(MAGICKCORE_WINDOWS_SUPPORT)
@@ -1508,7 +1508,7 @@ static void TagToFilterModuleName(const char *tag,char *name)
 #elif !defined(MAGICKCORE_LTDL_DELEGATE)
   (void) FormatLocaleString(name,MagickPathExtent,"%s.dll",tag);
 #else
-  (void) FormatLocaleString(name,MagickPathExtent,"%s" MAGICKCORE_LTDL_MODULE_EXT,tag);
+  (void) FormatLocaleString(name,MagickPathExtent,"%s.la",tag);
 #endif
 }