(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index a2fce5dbe9fa6cede6ebe55a60903b3537f110f7..ff4d312884e2c9b56010b887f85b6fe54dd17af6 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,7 +27,7 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2013 ImageMagick Studio LLC"
-#define MagickSVNRevision  "10131M"
+#define MagickSVNRevision  "10131:10145M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  8,0,0

diff --git a/Makefile.in b/Makefile.in
index 85d6631bcdcf233bbcc97dd8a351935d0e367a9f..e6ba7ce625a8a166ee8571b9103ae705ba81cd98 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1781,7 +1781,7 @@ Magick___demo_analyze_OBJECTS = $(am_Magick___demo_analyze_OBJECTS)
 @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_2 = Magick++/lib/libMagick++-@MAGICK_ABI_SUFFIX@.la
 @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_3 =  \
 @WITH_MAGICK_PLUS_PLUS_TRUE@   $(am__DEPENDENCIES_2) \
-@WITH_MAGICK_PLUS_PLUS_TRUE@   $(top_builddir)/magick/libMagickCore-@MAGICK_ABI_SUFFIX@.la
+@WITH_MAGICK_PLUS_PLUS_TRUE@   $(top_builddir)/MagickCore/libMagickCore-@MAGICK_ABI_SUFFIX@.la
 Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_3)
 am_Magick___demo_button_OBJECTS = Magick++/demo/button.$(OBJEXT)
 Magick___demo_button_OBJECTS = $(am_Magick___demo_button_OBJECTS)
@@ -4550,7 +4550,7 @@ MAGICKWAND_CLEANFILES =
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LIBS = 
 @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LIBS = Magick++/lib/libMagick++-@MAGICK_ABI_SUFFIX@.la
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LDADD = 
-@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/magick/libMagickCore-@MAGICK_ABI_SUFFIX@.la
+@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/MagickCore/libMagickCore-@MAGICK_ABI_SUFFIX@.la
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_CHECK_PGRMS = 
 @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT)
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_MANS = 

diff --git a/configure b/configure
index 5d9e707272cca77c47074827df92bf89639feb8a..42f8fbc243ac9e7f2e5e602591fe9eb017bc8bda 100755 (executable)
--- a/configure
+++ b/configure
@@ -3649,7 +3649,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=10131M
+MAGICK_SVN_REVISION=10131:10145M