(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index b7e2c8a8e5027509a0bc40c2000bb9d4c1149c1d..4b148099f7a5a874567437d3ecf339faa5401dcc 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10044:10055M"
+#define MagickSVNRevision  "10044:10059M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/MagickWand/Makefile.am b/MagickWand/Makefile.am
index bb57316320573a134d96c395effc74aef093c3bf..1c82e85acf3d72ebde77298594f1c438bcfb82b3 100644 (file)
--- a/MagickWand/Makefile.am
+++ b/MagickWand/Makefile.am
@@ -128,7 +128,7 @@ MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
 MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
 
 if HAVE_LD_VERSION_SCRIPT
-MagickWand_libMagickWand_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/wand/libMagickWand.map
+MagickWand_libMagickWand_la_LDFLAGS_VERSION =  -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
 else
 MagickWand_libMagickWand_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
 endif

diff --git a/Makefile.in b/Makefile.in
index 006e4ef2fed787bf300264b33d49b6a0949b012a..5cc85889470e4ded199e6de77d98ce32f2aef99c 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -4521,7 +4521,7 @@ MAGICKWAND_LIBS = MagickWand/libMagickWand.la
 MagickWand_libMagickWand_la_SOURCES = $(MAGICKWAND_SOURCES)
 MagickWand_libMagickWand_la_CPPFLAGS = $(LIBRARY_EXTRA_CPPFLAGS)
 @HAVE_LD_VERSION_SCRIPT_FALSE@MagickWand_libMagickWand_la_LDFLAGS_VERSION = -export-symbols-regex ".*"
-@HAVE_LD_VERSION_SCRIPT_TRUE@MagickWand_libMagickWand_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/wand/libMagickWand.map
+@HAVE_LD_VERSION_SCRIPT_TRUE@MagickWand_libMagickWand_la_LDFLAGS_VERSION = -Wl,--version-script=$(top_srcdir)/MagickWand/libMagickWand.map
 MagickWand_libMagickWand_la_LDFLAGS = -no-undefined \
   $(MagickWand_libMagickWand_la_LDFLAGS_VERSION) \
        $(MAGICK_LT_RELEASE_OPTS) -version-info \

diff --git a/configure b/configure
index 90b9e7cb99e3126db5809c3539bdea05e1b5d32b..49230dd029216ff56248d779f9b32408afb51cf5 100755 (executable)
--- a/configure
+++ b/configure
@@ -3639,7 +3639,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=10044:10055M
+MAGICK_SVN_REVISION=10044:10059M