(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 93288f535d0ba0c79654d14bd889368ab91ab2fb..8c1f8ab38b3e9a6ee977a19cc9a4a518827df13c 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  "9013:9027"
+#define MagickSVNRevision  "9013:9029M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  7,0,0

diff --git a/Makefile.am b/Makefile.am
index 749d5c6e8fbf02070f2f7c34efb1235ea773abc7..a6295e78d9873aa55113212e55ba5e8c07f69015 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -63,6 +63,14 @@ SRCDIR="$(srcdir)/"
 endif
 
 # Tests with .tap extensions use the TAP protocol and TAP driver
+LOG_COMPILER = $(SHELL)
+
+SH_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+
+# Test extensions
+TEST_EXTENSIONS = .sh .tap
+
 TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
        $(top_srcdir)/config/tap-driver.sh
 
@@ -87,9 +95,6 @@ TESTS_ENVIRONMENT = \
        PATH="@abs_top_builddir@/utilities:${PATH}" \
        SRCDIR=$(SRCDIR)
 
-# Test extensions
-TEST_EXTENSIONS = .sh .tap
-
 # Tests to run
 TESTS = \
        $(TESTS_TESTS) \

diff --git a/Makefile.in b/Makefile.in
index 85ca3c356d929de66252ecc7bca6e8476765f3e2..24939cbd10763fd48d20f921c882e18df34bde26 100644 (file)
--- a/Makefile.in
+++ b/Makefile.in
@@ -2898,6 +2898,12 @@ noinst_HEADERS = \
 @WIN32_NATIVE_BUILD_TRUE@SRCDIR = '$(shell @WinPathScript@ $(srcdir)/)'
 
 # Tests with .tap extensions use the TAP protocol and TAP driver
+LOG_COMPILER = $(SHELL)
+SH_LOG_COMPILER = $(LOG_COMPILER)
+TAP_LOG_COMPILER = $(LOG_COMPILER)
+
+# Test extensions
+TEST_EXTENSIONS = .sh .tap
 TAP_LOG_DRIVER = env AM_TAP_AWK='$(AWK)' $(SHELL) \
        $(top_srcdir)/config/tap-driver.sh
 
@@ -2923,9 +2929,6 @@ TESTS_ENVIRONMENT = \
        PATH="@abs_top_builddir@/utilities:${PATH}" \
        SRCDIR=$(SRCDIR)
 
-
-# Test extensions
-TEST_EXTENSIONS = .sh .tap
 TOP_EXTRA_DIST = \
   AUTHORS.txt \
        ChangeLog \

diff --git a/config/configure.xml b/config/configure.xml
index daf264d305a9fd4f4e202ada59437bd482c7fd61..fe957b8f69833d99d4098097134fc80bb32035f5 100644 (file)
--- a/config/configure.xml
+++ b/config/configure.xml
@@ -10,7 +10,7 @@
   <configure name="VERSION" value="7.0.0"/>
   <configure name="LIB_VERSION" value="0x700"/>
   <configure name="LIB_VERSION_NUMBER" value="7,0,0,0"/>
-  <configure name="SVN_REVISION" value="9013:9027" />
+  <configure name="SVN_REVISION" value="9013:9029M" />
   <configure name="RELEASE_DATE" value="2012-08-20"/>
   <configure name="CONFIGURE" value="./configure "/>
   <configure name="PREFIX" value="/usr/local"/>

diff --git a/configure b/configure
index e62d6293c8ac911257c041d0897b80a027fa3ee0..85c3e9d0e8a33169af7c7c7eb5bf6c1ab8ed5909 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=9013:9027
+MAGICK_SVN_REVISION=9013:9029M