(no commit message)

diff --git a/Makefile.in b/Makefile.in
index ef2f87d5a806e8a1cfd5f7f81e5c8cd8e352ccf5..3555c2b7dfaf575753ccaf317fdc518a6c3a2507 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -48,8 +48,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-#  Copyright (C) 2003 - 2008 GraphicsMagick Group
-#
 #  Makefile for building ImageMagick m4 macros.
 
 #  Copyright 1999-2009 ImageMagick Studio LLC, a non-profit organization
@@ -66,8 +64,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-#  Copyright (C) 2003 - 2008 GraphicsMagick Group
-#
 #  Makefile for Magick ImageMagick configuration files.
 
 #####
@@ -135,8 +131,6 @@
 #  See the License for the specific language governing permissions and
 #  limitations under the License.
 #
-#  Copyright (C) 2003 - 2008 GraphicsMagick Group
-#
 #  Makefile for building MagickWand API.
 #
 

diff --git a/config/configure.xml b/config/configure.xml
index f44fde716f1cd6de944e35fec4f1d5400098369f..da6b4cc41df8a93e7d65b334a5b15060ff68f468 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -9,7 +9,7 @@
   <configure name="NAME" value="ImageMagick"/>
   <configure name="LIB_VERSION" value="0x658"/>
   <configure name="LIB_VERSION_NUMBER" value="6,5,8,3"/>
-  <configure name="RELEASE_DATE" value="2009-11-28"/>
+  <configure name="RELEASE_DATE" value="2009-12-03"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/m4/libtool.m4 b/m4/libtool.m4
index 39ba996cb960e22873667c57deeff94bf23bef56..671cde117d476d7e82db4dbd22d3282f1b529e35 100644 (file)
--- a/m4/libtool.m4
+++ b/m4/libtool.m4
@@ -2470,10 +2470,13 @@ linux* | k*bsd*-gnu)
   # before this can be enabled.
   hardcode_into_libs=yes
 
+  # Add ABI-specific directories to the system library path.
+  sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib"
+
   # Append ld.so.conf contents to the search path
   if test -f /etc/ld.so.conf; then
     lt_ld_extra=`awk '/^include / { system(sprintf("cd /etc; cat %s 2>/dev/null", \[$]2)); skip = 1; } { if (!skip) print \[$]0; skip = 0; }' < /etc/ld.so.conf | $SED -e 's/#.*//;/^[  ]*hwcap[        ]/d;s/[:,      ]/ /g;s/=[^=]*$//;s/=[^= ]* / /g;/^$/d' | tr '\n' ' '`
-    sys_lib_dlsearch_path_spec="/lib /usr/lib $lt_ld_extra"
+    sys_lib_dlsearch_path_spec="$sys_lib_dlsearch_path_spec $lt_ld_extra"
   fi
 
   # We used to test for /lib/ld.so.1 and disable shared libraries on

diff --git a/magick/version.h b/magick/version.h
index 306cf668ac9557f7e4ec8ad46d3ae0a0e56af5aa..187b6afccd734a528e4b6b1a4a4d7370212d7215 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -31,7 +31,7 @@ extern "C" {
 #define MagickLibVersionText  "6.5.8"
 #define MagickLibVersionNumber  2,0,1
 #define MagickLibSubversion  "-3"
-#define MagickReleaseDate  "2009-11-28"
+#define MagickReleaseDate  "2009-12-03"
 #define MagickChangeDate   "20091128"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickHomeURL  "file:///usr/local/share/doc/ImageMagick-6.5.8/index.html"