(no commit message)

diff --git a/ChangeLog b/ChangeLog
index cbb58f727ec9a78732ff103e8918c9d8ecdc39e5..925cb660d56f89322580e4c8d07f04d674533bea 100644 (file)
--- 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 c2a009876b7c16369a46055dc61b9862d407584d..0c101f97b4e9134cb30793a3ec9ca530829128fa 100644 (file)
--- 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);
 }
 \f