(no commit message)

diff --git a/MagickCore/version.h b/MagickCore/version.h
index 2d5c9cc22f955e5e3a4f3977a50c505e9b237eb9..a5f952a206a9b3f46e7dc6c6e2677dfc9ef3ef93 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  "15686:15688M"
+#define MagickSVNRevision  "15693M"
 #define MagickLibVersion  0x700
 #define MagickLibVersionText  "7.0.0"
 #define MagickLibVersionNumber  1,0,0

diff --git a/configure b/configure
index 439e462e3605336f131aa43183b1205e16444380..aa5538435c2d75cfafae83566b78e2b9c10c4817 100755 (executable)
--- a/configure
+++ b/configure
@@ -3697,7 +3697,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=15686:15688M
+MAGICK_SVN_REVISION=15693M
 
 
 # Substitute library versioning
@@ -30131,12 +30131,12 @@ if test -n "$LIBOPENJP2_CFLAGS"; then
     pkg_cv_LIBOPENJP2_CFLAGS="$LIBOPENJP2_CFLAGS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.0.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBOPENJP2_CFLAGS=`$PKG_CONFIG --cflags "libopenjp2 >= 2.0.1" 2>/dev/null`
+  pkg_cv_LIBOPENJP2_CFLAGS=`$PKG_CONFIG --cflags "libopenjp2 >= 2.1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30147,12 +30147,12 @@ if test -n "$LIBOPENJP2_LIBS"; then
     pkg_cv_LIBOPENJP2_LIBS="$LIBOPENJP2_LIBS"
  elif test -n "$PKG_CONFIG"; then
     if test -n "$PKG_CONFIG" && \
-    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.0.1\""; } >&5
-  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.0.1") 2>&5
+    { { $as_echo "$as_me:${as_lineno-$LINENO}: \$PKG_CONFIG --exists --print-errors \"libopenjp2 >= 2.1.0\""; } >&5
+  ($PKG_CONFIG --exists --print-errors "libopenjp2 >= 2.1.0") 2>&5
   ac_status=$?
   $as_echo "$as_me:${as_lineno-$LINENO}: \$? = $ac_status" >&5
   test $ac_status = 0; }; then
-  pkg_cv_LIBOPENJP2_LIBS=`$PKG_CONFIG --libs "libopenjp2 >= 2.0.1" 2>/dev/null`
+  pkg_cv_LIBOPENJP2_LIBS=`$PKG_CONFIG --libs "libopenjp2 >= 2.1.0" 2>/dev/null`
 else
   pkg_failed=yes
 fi
@@ -30170,9 +30170,9 @@ else
         _pkg_short_errors_supported=no
 fi
         if test $_pkg_short_errors_supported = yes; then
-               LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenjp2 >= 2.0.1" 2>&1`
+               LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --short-errors --print-errors "libopenjp2 >= 2.1.0" 2>&1`
         else
-               LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenjp2 >= 2.0.1" 2>&1`
+               LIBOPENJP2_PKG_ERRORS=`$PKG_CONFIG --print-errors "libopenjp2 >= 2.1.0" 2>&1`
         fi
        # Put the nasty error message in config.log where it belongs
        echo "$LIBOPENJP2_PKG_ERRORS" >&5

diff --git a/configure.ac b/configure.ac
index c6e2c09985def3feb94b6af1905396f1d989a635..31937da621b13e97d1abc3ba4e88dfb436a45c13 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2408,7 +2408,7 @@ LIBOPENJP2_LIBS=""
 LIBOPENJP2_PKG=""
 if test "x$with_openjp2" = "xyes"; then
     AC_MSG_RESULT([-------------------------------------------------------------])
-    PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.0.1], have_openjp2=yes, have_openjp2=no)
+    PKG_CHECK_MODULES(LIBOPENJP2,[libopenjp2 >= 2.1.0], have_openjp2=yes, have_openjp2=no)
     AC_MSG_RESULT([])
 fi