(no commit message)

diff --git a/config/configure.xml b/config/configure.xml
index 5f29d78836f8fffde2d68b7555432f2a278b9fb9..ae02ec045035ec0539f621d15b3894a8f334d475 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,8 +10,8 @@
   <configure name="VERSION" value="6.7.0"/>
   <configure name="LIB_VERSION" value="0x670"/>
   <configure name="LIB_VERSION_NUMBER" value="6,7,0,10"/>
-  <configure name="SVN_REVISION" value="4615" />
-  <configure name="RELEASE_DATE" value="2011-06-25"/>
+  <configure name="SVN_REVISION" value="4660" />
+  <configure name="RELEASE_DATE" value="2011-06-30"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>
   <configure name="EXEC-PREFIX" value="/usr/local"/>

diff --git a/config/ltmain.sh b/config/ltmain.sh
index 78cf0175299df87e4203c93bc64e8194ecb45366..aa5624c816121f8623e9a64511fa7a18356bce99 100644 (file)
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -8050,7 +8050,7 @@ EOF
            elif test -n "$runpath_var"; then
              case "$perm_rpath " in
              *" $libdir "*) ;;
-             *) func_append perm_rpath " $libdir" ;;
+             *) func_apped perm_rpath " $libdir" ;;
              esac
            fi
          done

diff --git a/configure b/configure
index 297857b0868afbaefbc9588822d7a03a23be19bb..3e3efb054374789d758c88355655bf0c06651016 100755 (executable)
--- a/configure
+++ b/configure
@@ -3582,7 +3582,7 @@ MAGICK_LIBRARY_CURRENT_MIN=`expr $MAGICK_LIBRARY_CURRENT - $MAGICK_LIBRARY_AGE`
 
 MAGICK_LIBRARY_VERSION_INFO=$MAGICK_LIBRARY_CURRENT:$MAGICK_LIBRARY_REVISION:$MAGICK_LIBRARY_AGE
 
-MAGICK_SVN_REVISION=4615
+MAGICK_SVN_REVISION=4660
 
 
 
@@ -21207,9 +21207,6 @@ case "${with_quantum_depth}" in
     64 ) ;;
     * ) as_fn_error 16 "\"Pixel quantum depth must have value of 8" "$LINENO" 5 ;;
 esac
-if test "$enable_hdri" = 'yes'; then
-  with_quantum_depth=16
-fi
 QUANTUM_DEPTH="$with_quantum_depth"
 
 cat >>confdefs.h <<_ACEOF

diff --git a/libtool b/libtool
index 34539158d2b7a49f98ca2c5b6c12d6c855ed622e..0c083b3138f201acc8fc76552adb7748041b3f2e 100755 (executable)
--- a/libtool
+++ b/libtool
@@ -272,7 +272,7 @@ finish_eval=""
 hardcode_into_libs=yes
 
 # Compile-time system search path for libraries.
-sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.6.0 /usr/lib64 /lib64 "
+sys_lib_search_path_spec="/usr/lib/gcc/x86_64-redhat-linux/4.6.1 /usr/lib64 /lib64 "
 
 # Run-time system search path for libraries.
 sys_lib_dlsearch_path_spec="/lib64 /usr/lib64 /lib /usr/lib /usr/lib64/atlas /usr/lib64/mysql /usr/lib64/qt-3.3/lib /usr/lib64/tcl8.5/tclx8.4 /usr/lib64/tcl8.5 /usr/lib/wine/ /usr/lib64/wine/ /usr/lib64/xulrunner-2 "
@@ -8490,7 +8490,7 @@ EOF
            elif test -n "$runpath_var"; then
              case "$perm_rpath " in
              *" $libdir "*) ;;
-             *) perm_rpath+=" $libdir" ;;
+             *) func_apped perm_rpath " $libdir" ;;
              esac
            fi
          done
@@ -10213,17 +10213,17 @@ file_list_spec=""
 hardcode_action=immediate
 
 # The directories searched by this compiler when creating a shared library.
-compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.6.0 /usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../.."
+compiler_lib_search_dirs="/usr/lib/gcc/x86_64-redhat-linux/4.6.1 /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64 /lib/../lib64 /usr/lib/../lib64 /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../.."
 
 # Dependencies to place before and after the objects being linked to
 # create a shared library.
-predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.6.0/crtbeginS.o"
-postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.0/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64/crtn.o"
+predep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64/crti.o /usr/lib/gcc/x86_64-redhat-linux/4.6.1/crtbeginS.o"
+postdep_objects="/usr/lib/gcc/x86_64-redhat-linux/4.6.1/crtendS.o /usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64/crtn.o"
 predeps=""
 postdeps="-lstdc++ -lm -lgcc_s -lpthread -lc -lgcc_s"
 
 # The library search path used internally by the compiler when linking
 # a shared library.
-compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.6.0 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.0/../../.."
+compiler_lib_search_path="-L/usr/lib/gcc/x86_64-redhat-linux/4.6.1 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../../../lib64 -L/lib/../lib64 -L/usr/lib/../lib64 -L/usr/lib/gcc/x86_64-redhat-linux/4.6.1/../../.."
 
 # ### END LIBTOOL TAG CONFIG: CXX

diff --git a/magick/version.h b/magick/version.h
index 788db96c440988e8e3f3c9cac8f1f47c61e47b52..043d32e8b02e81b96a8f1d40681075c4a8ad9b82 100644 (file)
--- a/magick/version.h
+++ b/magick/version.h
@@ -27,15 +27,15 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2011 ImageMagick Studio LLC"
-#define MagickSVNRevision  "4615"
+#define MagickSVNRevision  "4660"
 #define MagickLibVersion  0x670
 #define MagickLibVersionText  "6.7.0"
 #define MagickLibVersionNumber  4,0,1
 #define MagickLibAddendum  "-10"
 #define MagickLibInterface  4
 #define MagickLibMinInterface  4
-#define MagickReleaseDate  "2011-06-25"
-#define MagickChangeDate   "20110625"
+#define MagickReleaseDate  "2011-06-30"
+#define MagickChangeDate   "20110609"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)
 #define MagickOpenMPFeature  "OpenMP "