From: cristy <urban-warrior@git.imagemagick.org>
Date: Sat, 30 Oct 2010 02:27:14 +0000 (+0000)
Subject: (no commit message)
X-Git-Tag: 7.0.1-0~8588
X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=51b1ac570a6e567198d7209db591c4211a5c7672;p=imagemagick

---

diff --git a/ChangeLog b/ChangeLog
index cbb58f727..925cb660d 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,13 +1,17 @@
-2010-10-29  6.6.5-1 Glenn Randers-Pehrson <glennrp@image...>
+2010-10-30  6.6.5-5 Cristy  <quetzlzacatenango@image...>
+  * Do not read configure files in the current directory for the "installed"
+    version of ImageMagick.
+
+2010-10-29  6.6.5-4 Glenn Randers-Pehrson <glennrp@image...>
   * Revised PNG palette optimization
   * Added some debug logging in coders/png.c.
 
-2010-10-28  6.6.5-1 Nicolas Robidoux <nicolas.robidoux@gmail...>
+2010-10-28  6.6.5-3 Nicolas Robidoux <nicolas.robidoux@gmail...>
   * More precise blur values for Lanczos2Sharp and LanczosSharp.
   * Added location of first Mitchell crossing (=8/7) to the filters data
     structure.
 
-2010-10-28  6.6.5-1 Anthony Thyssen <A.Thyssen@griffith...>
+2010-10-28  6.6.5-2 Anthony Thyssen <A.Thyssen@griffith...>
   * Added Lanczos2D* filters now named Lanczos2*
   * Reorganization of AcquireFilter() to make it work better
 
diff --git a/magick/configure.c b/magick/configure.c
index c2a009876..0c101f97b 100644
--- a/magick/configure.c
+++ b/magick/configure.c
@@ -749,6 +749,10 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
       (void) AppendValueToLinkedList(paths,ConstantString(path));
 #endif
     }
+  /*
+    Search current directory.
+  */
+  (void) AppendValueToLinkedList(paths,ConstantString(""));
 #endif
   {
     char
@@ -803,10 +807,6 @@ MagickExport LinkedListInfo *GetConfigurePaths(const char *filename,
       }
   }
 #endif
-  /*
-    Search current directory.
-  */
-  (void) AppendValueToLinkedList(paths,ConstantString(""));
   return(paths);
 }