(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 7c1e75835c0a19eaf9ab1aca987aa24f882c89d0..a5119535c78b06cf5fb41bef33ac7c0b87d7707c 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  "16921:16936M"
+#define MagickSVNRevision  "16921:16940M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/configure b/configure
index f579a84945c903c4357d74b7d87078a59df82d50..f02995afc4fe3ef4d87c40d4a3fb473e553fb8ec 100755 (executable)
--- a/configure
+++ b/configure
@@ -3703,7 +3703,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=16921:16936M
+MAGICK_SVN_REVISION=16921:16940M
 
 
 # Substitute library versioning
@@ -26627,7 +26627,9 @@ $as_echo "" >&6; }
   passed=0
   ac_fn_c_check_header_mongrel "$LINENO" "jemalloc/jemalloc.h" "ac_cv_header_jemalloc_jemalloc_h" "$ac_includes_default"
 if test "x$ac_cv_header_jemalloc_jemalloc_h" = xyes; then :
-  passed=`expr $passed + 1`,failed=`expr $failed + 1`
+  passed=`expr $passed + 1`
+else
+  failed=`expr $failed + 1`
 fi
 
 
@@ -26668,7 +26670,9 @@ fi
 { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ac_cv_lib_jemalloc_malloc_stats_print" >&5
 $as_echo "$ac_cv_lib_jemalloc_malloc_stats_print" >&6; }
 if test "x$ac_cv_lib_jemalloc_malloc_stats_print" = xyes; then :
-  passed=`expr $passed + 1`,failed=`expr $failed + 1`
+  passed=`expr $passed + 1`
+else
+  failed=`expr $failed + 1`
 fi
 
   { $as_echo "$as_me:${as_lineno-$LINENO}: checking if jemalloc memory allocation library is complete" >&5

diff --git a/configure.ac b/configure.ac
index ef52b998341b327182ae3119d7bc17e50bf7889b..6ac8a3f11ab47057a71f4ae6e5db63870af4a90d 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -1445,8 +1445,8 @@ if test "$with_jemalloc" != 'no'; then
   AC_MSG_RESULT()
   failed=0
   passed=0
-  AC_CHECK_HEADER([jemalloc/jemalloc.h],[passed=`expr $passed + 1`,failed=`expr $failed + 1`])
-  AC_CHECK_LIB(jemalloc,[malloc_stats_print],[passed=`expr $passed + 1`,failed=`expr $failed + 1`],)
+  AC_CHECK_HEADER([jemalloc/jemalloc.h],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`])
+  AC_CHECK_LIB(jemalloc,[malloc_stats_print],[passed=`expr $passed + 1`],[failed=`expr $failed + 1`],)
   AC_MSG_CHECKING(if jemalloc memory allocation library is complete)
   if test $passed -gt 0; then
     if test $failed -gt 0; then