(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 297eb746f30298f655b7907eb3097b65123d8358..4b27c26ac130f4ffc162e55de47a54b700a564ed 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "12018M"
+#define MagickSVNRevision  "12035:12037M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  1
 #define MagickLibMinInterface  1
-#define MagickReleaseDate  "2013-04-27"
+#define MagickReleaseDate  "2013-04-28"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/config/ltmain.sh b/config/ltmain.sh
index 63ae69dc6fecaf83c52fba2ad334f4b1369fb1cd..0af95975a751da5628a0b8846516540d26a38335 100644 (file)
--- a/config/ltmain.sh
+++ b/config/ltmain.sh
@@ -82,6 +82,7 @@ PROGRAM=libtool
 PACKAGE=libtool
 VERSION=2.4.2
 TIMESTAMP=""
+: ${DD=dd}
 package_revision=1.3337
 
 # Be Bourne compatible
@@ -1224,6 +1225,21 @@ func_enable_tag "$optarg"
 ##    Main.    ##
 ## ----------- ##
 
+# func_try_sizelim file n
+# try to write at most the first N bytes from FILE to the standard output when
+# possible, otherwise put whole file
+func_try_sizelim ()
+{
+  if test -n "$DD"; then
+    $DD if="$1" bs=$2 count=1 2>/dev/null
+    if test $? -eq 127; then
+      cat "$1" 2>/dev/null
+    fi
+  else
+    cat "$1" 2>/dev/null
+  fi
+}
+
 # func_lalib_p file
 # True iff FILE is a libtool `.la' library or `.lo' object file.
 # This function is only a basic sanity check; it will hardly flush out
@@ -1231,7 +1247,7 @@ func_enable_tag "$optarg"
 func_lalib_p ()
 {
     test -f "$1" &&
-      $SED -e 4q "$1" 2>/dev/null \
+      func_try_sizelim "$1" 4096 | $SED -e 4q 2>/dev/null \
         | $GREP "^# Generated by .*$PACKAGE" > /dev/null 2>&1
 }
 

diff --git a/configure b/configure
index 922e5eda2e2358b07b0fdece9e3a829e49cdce4c..2effe697e7f1e6701182e8445c400883994d4581 100755 (executable)
--- a/configure
+++ b/configure
@@ -3679,7 +3679,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=12018M
+MAGICK_SVN_REVISION=12035:12037M
 
 
 # Substitute library versioning