(no commit message)

diff --git a/Magick++/Makefile.am b/Magick++/Makefile.am
index bf5f7d3610ec30b163d00629b34996155ab116a2..6a78531db9bf32fe220b6aef989b3173ddf66230 100644 (file)
--- a/Magick++/Makefile.am
+++ b/Magick++/Makefile.am
@@ -8,7 +8,7 @@ AM_CPPFLAGS += -I$(top_srcdir)/Magick++/lib
 
 if WITH_MAGICK_PLUS_PLUS
 MAGICKPP_LIBS = Magick++/lib/libMagick++.la
-MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/magick/libMagickCore.la
+MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/MagickCore/libMagickCore.la
 MAGICKPP_CHECK_PGRMS = $(MAGICKPP_CHECK_PGRMS_OPT)
 MAGICKPP_MANS = $(MAGICKPP_MANS_OPT)
 MAGICKPP_PKGCONFIG = $(MAGICKPP_PKGCONFIG_OPT)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 165ac912443b6a695710c11549b64a66f14218a0..bf99a646106064404ee38fd12748b1b0cd6f56cd 100644 (file)
--- a/MagickCore/version.h
+++ b/MagickCore/version.h
@@ -27,14 +27,14 @@ extern "C" {
 */
 #define MagickPackageName "ImageMagick"
 #define MagickCopyright  "Copyright (C) 1999-2012 ImageMagick Studio LLC"
-#define MagickSVNRevision  "9270:9273M"
+#define MagickSVNRevision  "9270:9274M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0
 #define MagickLibAddendum  "-0"
 #define MagickLibInterface  7
 #define MagickLibMinInterface  7
-#define MagickReleaseDate  "2012-09-07"
+#define MagickReleaseDate  "2012-09-08"
 #define MagickChangeDate   "20120904"
 #define MagickAuthoritativeURL  "http://www.imagemagick.org"
 #if defined(MAGICKCORE_OPENMP_SUPPORT)

diff --git a/Makefile.in b/Makefile.in
index e6f29ff377fa1f8c8d7395ae2b271d5388848eab..d38774c9394d15dcadcef892f041fe49b85897ab 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -1853,7 +1853,7 @@ Magick___demo_analyze_OBJECTS = $(am_Magick___demo_analyze_OBJECTS)
 @WITH_MAGICK_PLUS_PLUS_TRUE@   Magick++/lib/libMagick++.la
 @WITH_MAGICK_PLUS_PLUS_TRUE@am__DEPENDENCIES_4 =  \
 @WITH_MAGICK_PLUS_PLUS_TRUE@   $(am__DEPENDENCIES_3) \
-@WITH_MAGICK_PLUS_PLUS_TRUE@   $(top_builddir)/magick/libMagickCore.la
+@WITH_MAGICK_PLUS_PLUS_TRUE@   $(top_builddir)/MagickCore/libMagickCore.la
 Magick___demo_analyze_DEPENDENCIES = $(am__DEPENDENCIES_4)
 am_Magick___demo_button_OBJECTS = Magick++/demo/button.$(OBJEXT)
 Magick___demo_button_OBJECTS = $(am_Magick___demo_button_OBJECTS)
@@ -4644,7 +4644,7 @@ MAGICKWAND_CLEANFILES =
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LIBS = 
 @WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LIBS = Magick++/lib/libMagick++.la
 @WITH_MAGICK_PLUS_PLUS_FALSE@MAGICKPP_LDADD = 
-@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/magick/libMagickCore.la
+@WITH_MAGICK_PLUS_PLUS_TRUE@MAGICKPP_LDADD = $(MAGICKPP_LIBS) $(top_builddir)/MagickCore/libMagickCore.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 b4f8d45bef509fe30d7fda8c34f1e56292d7f504..afadc3dc0cb171537bd1dee26bf4e4ef3d82a532 100755 (executable)
--- a/configure
+++ b/configure
@@ -3666,7 +3666,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=9270:9273M
+MAGICK_SVN_REVISION=9270:9274M