(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index e73a17d721320eb32e7c825ab05d4e1a887aac30..5436eb75bc3b39d2311b7eb6711ce6beb094c61c 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2014 ImageMagick Studio LLC"
-#define MagickSVNRevision  "15559M"
+#define MagickSVNRevision  "15595:15606M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0
@@ -48,7 +48,7 @@ extern "C" {
 #define MagickppLibAddendum  "-0"
 #define MagickppLibInterface  1
 #define MagickppLibMinInterface  1
-#define MagickReleaseDate  "2014-04-26"
+#define MagickReleaseDate  "2014-04-28"
 #define MagickChangeDate   "20120427"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #define MagickFeatures "DPC HDRI OpenMP"

diff --git a/configure b/configure
index 3ab1a75d2f2f216196402405be9b9102eee319aa..a246fc2c0b5abd1ba38a6063323dd167f3bf367b 100755 (executable)
--- a/configure
+++ b/configure
@@ -3697,7 +3697,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15559M
+MAGICK_SVN_REVISION=15595:15606M
 
 
 # Substitute library versioning
@@ -38933,12 +38933,11 @@ Options used to compile and link:
   VERSION         = $PACKAGE_VERSION
   CC              = $CC
   CFLAGS          = $CFLAGS
-  CPPFLAGS        = $MAGICK_CPPFLAGS
-  PCFLAGS         = $MAGICK_PCFLAGS
+  CPPFLAGS        = $CPPFLAGS
+  PCFLAGS         = $PCFLAGS
   DEFS            = $DEFS
   LDFLAGS         = $LDFLAGS
-  MAGICK_LDFLAGS  = $MAGICK_LDFLAGS
-  LIBS            = $MAGICK_LIBS
+  LIBS            = $LIBS
   CXX             = $CXX
   CXXFLAGS        = $CXXFLAGS
   FEATURES        = $MAGICK_FEATURES
@@ -39012,12 +39011,11 @@ Options used to compile and link:
   VERSION         = $PACKAGE_VERSION
   CC              = $CC
   CFLAGS          = $CFLAGS
-  CPPFLAGS        = $MAGICK_CPPFLAGS
-  PCFLAGS         = $MAGICK_PCFLAGS
+  CPPFLAGS        = $CPPFLAGS
+  PCFLAGS         = $PCFLAGS
   DEFS            = $DEFS
   LDFLAGS         = $LDFLAGS
-  MAGICK_LDFLAGS  = $MAGICK_LDFLAGS
-  LIBS            = $MAGICK_LIBS
+  LIBS            = $LIBS
   CXX             = $CXX
   CXXFLAGS        = $CXXFLAGS
   FEATURES        = $MAGICK_FEATURES

diff --git a/configure.ac b/configure.ac
index d3e06065398ee7b5a96b6de9e90cbb68fc369a3b..5aee0da842838abc7c9b7230872d2d43a32c9956 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -4079,12 +4079,11 @@ Options used to compile and link:
   VERSION         = $PACKAGE_VERSION
   CC              = $CC
   CFLAGS          = $CFLAGS
-  CPPFLAGS        = $MAGICK_CPPFLAGS
-  PCFLAGS         = $MAGICK_PCFLAGS
+  CPPFLAGS        = $CPPFLAGS
+  PCFLAGS         = $PCFLAGS
   DEFS            = $DEFS
   LDFLAGS         = $LDFLAGS
-  MAGICK_LDFLAGS  = $MAGICK_LDFLAGS
-  LIBS            = $MAGICK_LIBS
+  LIBS            = $LIBS
   CXX             = $CXX
   CXXFLAGS        = $CXXFLAGS
   FEATURES        = $MAGICK_FEATURES