(no commit message)

diff --git a/configure b/configure
index b7b0104881fa4066a86ebc2475bbb1d4870cb4fd..9dabe2e7e555257f1233787035c0ec6befa73a14 100755 (executable)
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@ MAGICK_PATCHLEVEL_VERSION=0
 
 MAGICK_VERSION=7.0.0-0
 
-MAGICK_SVN_REVISION=18759:18767M
+MAGICK_SVN_REVISION=18759:18769M
 
 
 # Substitute library versioning
@@ -29820,7 +29820,7 @@ fi
 if test "${with_gvc+set}" = set; then :
   withval=$with_gvc; with_gvc=$withval
 else
-  with_gvc='no'
+  with_gvc='yes'
 fi
 
 
@@ -35033,7 +35033,7 @@ $as_echo "" >&6; }
     # PCLColorDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl color device" >&5
 $as_echo_n "checking for pcl color device... " >&6; }
-    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         PCLColorDevice=ppmraw
@@ -35044,7 +35044,7 @@ $as_echo "$PCLColorDevice" >&6; }
     # PCLCMYKDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl CMYK device" >&5
 $as_echo_n "checking for pcl CMYK device... " >&6; }
-    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         PCLCMYKDevice=$PCLColorDevice
@@ -35055,7 +35055,7 @@ $as_echo "$PCLCMYKDevice" >&6; }
     # PCLMonoDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for pcl mono device" >&5
 $as_echo_n "checking for pcl mono device... " >&6; }
-    if $PCLDelegate -dBATCH -sDEVICE=$PCLMonoDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PCLDelegate -dBATCH -sDEVICE=$PCLMonoDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         PCLMonoDevice=$PCLColorDevice
@@ -35088,7 +35088,7 @@ $as_echo "" >&6; }
     # XPSColorDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps color device" >&5
 $as_echo_n "checking for xps color device... " >&6; }
-    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         XPSColorDevice=ppmraw
@@ -35099,7 +35099,7 @@ $as_echo "$XPSColorDevice" >&6; }
     # XPSCMYKDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps CMYK device" >&5
 $as_echo_n "checking for xps CMYK device... " >&6; }
-    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         XPSCMYKDevice=$XPSColorDevice
@@ -35110,7 +35110,7 @@ $as_echo "$XPSCMYKDevice" >&6; }
     # XPSMonoDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for xps mono device" >&5
 $as_echo_n "checking for xps mono device... " >&6; }
-    if $XPSDelegate -dBATCH -sDEVICE=$XPSMonoDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $XPSDelegate -dBATCH -sDEVICE=$XPSMonoDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         XPSMonoDevice=$XPSColorDevice
@@ -35155,7 +35155,7 @@ $as_echo "$GSVersion" >&6; }
     # GSAlphaDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs alpha device" >&5
 $as_echo_n "checking for gs alpha device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSAlphaDevice=pnmraw
@@ -35166,7 +35166,7 @@ $as_echo "$GSAlphaDevice" >&6; }
     # GSColorDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs color device" >&5
 $as_echo_n "checking for gs color device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSColorDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSColorDevice=pnmraw
@@ -35177,7 +35177,7 @@ $as_echo "$GSColorDevice" >&6; }
     # GSCMYKDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs CMYK device" >&5
 $as_echo_n "checking for gs CMYK device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSCMYKDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSCMYKDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSCMYKDevice=bmpsep8
@@ -35188,7 +35188,7 @@ $as_echo "$GSCMYKDevice" >&6; }
     # GSMonoDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs mono device" >&5
 $as_echo_n "checking for gs mono device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSMonoDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSMonoDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSMonoDevice=$GSColorDevice
@@ -35199,7 +35199,7 @@ $as_echo "$GSMonoDevice" >&6; }
     # GSPDFDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs PDF writing device" >&5
 $as_echo_n "checking for gs PDF writing device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSPDFDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSPDFDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSPDFDevice=nodevice
@@ -35210,7 +35210,7 @@ $as_echo "$GSPDFDevice" >&6; }
     # GSPSDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs PS writing device" >&5
 $as_echo_n "checking for gs PS writing device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSPSDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSPSDevice=pswrite
@@ -35221,7 +35221,7 @@ $as_echo "$GSPSDevice" >&6; }
     # GSEPSDevice
     { $as_echo "$as_me:${as_lineno-$LINENO}: checking for gs EPS writing device" >&5
 $as_echo_n "checking for gs EPS writing device... " >&6; }
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSEPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSEPSDevice -sOutputFile=/dev/null < /dev/null 1>&5 2>&5; then
         :
     else
         GSEPSDevice=epswrite
@@ -35482,9 +35482,6 @@ fi
 if test "$have_png$have_jpeg" = 'yesyes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES jng"
 fi
-if test "$have_jp2"   = 'yes' ; then
-   MAGICK_DELEGATES="$MAGICK_DELEGATES jp2"
-fi
 if test "$have_jpeg"   = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES jpeg"
 fi
@@ -38803,9 +38800,8 @@ matches your expectations.
   Graphviz          --with-gvc=$with_gvc               $have_gvc
   JBIG              --with-jbig=$with_jbig             $have_jbig
   JPEG v1           --with-jpeg=$with_jpeg             $have_jpeg
-  JPEG-2000         --with-jp2=$with_jp2               $have_jp2
   LCMS              --with-lcms=$with_lcms             $have_lcms
-  LIBJPEG2          --with-openjp2=$with_openjp2       $have_openjp2
+  LIBJPEG2          --with-openjp2=$with_openjp2               $have_openjp2
   LQR               --with-lqr=$with_lqr               $have_lqr
   LTDL              --with-ltdl=$with_ltdl             $have_ltdl
   LZMA              --with-lzma=$with_lzma             $have_lzma
@@ -38889,9 +38885,8 @@ matches your expectations.
   Graphviz          --with-gvc=$with_gvc               $have_gvc
   JBIG              --with-jbig=$with_jbig             $have_jbig
   JPEG v1           --with-jpeg=$with_jpeg             $have_jpeg
-  JPEG-2000         --with-jp2=$with_jp2               $have_jp2
   LCMS              --with-lcms=$with_lcms             $have_lcms
-  LIBJPEG2          --with-openjp2=$with_openjp2       $have_openjp2
+  LIBJPEG2          --with-openjp2=$with_openjp2               $have_openjp2
   LQR               --with-lqr=$with_lqr               $have_lqr
   LTDL              --with-ltdl=$with_ltdl             $have_ltdl
   LZMA              --with-lzma=$with_lzma             $have_lzma

diff --git a/configure.ac b/configure.ac
index 63d6784a8e7aa92892f9f710383b9643d151f566..d4a65ba168066f3b4119cef3c296582b8712261a 100755 (executable)
--- a/configure.ac
+++ b/configure.ac
@@ -2110,7 +2110,7 @@ AC_ARG_WITH(gvc,
     [AC_HELP_STRING([--with-gvc],
                     [enable GVC support])],
     [with_gvc=$withval],
-    [with_gvc='no'])
+    [with_gvc='yes'])
 
 if test "$with_gvc" != 'yes'; then
     DISTCHECK_CONFIG_FLAGS="${DISTCHECK_CONFIG_FLAGS} --with-gvc=$with_gvc "
@@ -3319,7 +3319,7 @@ if test $have_pcl = 'yes'; then
     AC_MSG_RESULT([])
     # PCLColorDevice
     AC_MSG_CHECKING([for pcl color device])
-    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         PCLColorDevice=ppmraw
@@ -3328,7 +3328,7 @@ if test $have_pcl = 'yes'; then
 
     # PCLCMYKDevice
     AC_MSG_CHECKING([for pcl CMYK device])
-    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PCLDelegate -dBATCH -sDEVICE=$PCLColorDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         PCLCMYKDevice=$PCLColorDevice
@@ -3337,7 +3337,7 @@ if test $have_pcl = 'yes'; then
 
     # PCLMonoDevice
     AC_MSG_CHECKING([for pcl mono device])
-    if $PCLDelegate -dBATCH -sDEVICE=$PCLMonoDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PCLDelegate -dBATCH -sDEVICE=$PCLMonoDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         PCLMonoDevice=$PCLColorDevice
@@ -3365,7 +3365,7 @@ if test $have_xps = 'yes'; then
     AC_MSG_RESULT([])
     # XPSColorDevice
     AC_MSG_CHECKING([for xps color device])
-    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         XPSColorDevice=ppmraw
@@ -3374,7 +3374,7 @@ if test $have_xps = 'yes'; then
 
     # XPSCMYKDevice
     AC_MSG_CHECKING([for xps CMYK device])
-    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $XPSDelegate -dBATCH -sDEVICE=$XPSColorDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         XPSCMYKDevice=$XPSColorDevice
@@ -3383,7 +3383,7 @@ if test $have_xps = 'yes'; then
 
     # XPSMonoDevice
     AC_MSG_CHECKING([for xps mono device])
-    if $XPSDelegate -dBATCH -sDEVICE=$XPSMonoDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $XPSDelegate -dBATCH -sDEVICE=$XPSMonoDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         XPSMonoDevice=$XPSColorDevice
@@ -3421,7 +3421,7 @@ if test $have_gs = 'yes'; then
 
     # GSAlphaDevice
     AC_MSG_CHECKING([for gs alpha device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSAlphaDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSAlphaDevice=pnmraw
@@ -3430,7 +3430,7 @@ if test $have_gs = 'yes'; then
 
     # GSColorDevice
     AC_MSG_CHECKING([for gs color device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSColorDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSColorDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSColorDevice=pnmraw
@@ -3439,7 +3439,7 @@ if test $have_gs = 'yes'; then
 
     # GSCMYKDevice
     AC_MSG_CHECKING([for gs CMYK device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSCMYKDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSCMYKDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSCMYKDevice=bmpsep8
@@ -3448,7 +3448,7 @@ if test $have_gs = 'yes'; then
 
     # GSMonoDevice
     AC_MSG_CHECKING([for gs mono device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSMonoDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSMonoDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSMonoDevice=$GSColorDevice
@@ -3457,7 +3457,7 @@ if test $have_gs = 'yes'; then
 
     # GSPDFDevice
     AC_MSG_CHECKING([for gs PDF writing device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSPDFDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSPDFDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSPDFDevice=nodevice
@@ -3466,7 +3466,7 @@ if test $have_gs = 'yes'; then
 
     # GSPSDevice
     AC_MSG_CHECKING([for gs PS writing device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSPSDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSPSDevice=pswrite
@@ -3475,7 +3475,7 @@ if test $have_gs = 'yes'; then
 
     # GSEPSDevice
     AC_MSG_CHECKING([for gs EPS writing device])
-    if $PSDelegate -q -dBATCH -sDEVICE=$GSEPSDevice -sOutputFile=/dev/null < /dev/null 2> /dev/null; then
+    if $PSDelegate -q -dBATCH -sDEVICE=$GSEPSDevice -sOutputFile=/dev/null < /dev/null 1>&AS_MESSAGE_LOG_FD 2>&AS_MESSAGE_LOG_FD; then
         :
     else
         GSEPSDevice=epswrite
@@ -3588,9 +3588,6 @@ fi
 if test "$have_png$have_jpeg" = 'yesyes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES jng"
 fi
-if test "$have_jp2"   = 'yes' ; then
-   MAGICK_DELEGATES="$MAGICK_DELEGATES jp2"
-fi
 if test "$have_jpeg"   = 'yes' ; then
    MAGICK_DELEGATES="$MAGICK_DELEGATES jpeg"
 fi
@@ -3867,9 +3864,8 @@ matches your expectations.
   Graphviz          --with-gvc=$with_gvc               $have_gvc
   JBIG              --with-jbig=$with_jbig             $have_jbig
   JPEG v1           --with-jpeg=$with_jpeg             $have_jpeg
-  JPEG-2000         --with-jp2=$with_jp2               $have_jp2
   LCMS              --with-lcms=$with_lcms             $have_lcms
-  LIBJPEG2          --with-openjp2=$with_openjp2       $have_openjp2
+  LIBJPEG2          --with-openjp2=$with_openjp2               $have_openjp2
   LQR               --with-lqr=$with_lqr               $have_lqr
   LTDL              --with-ltdl=$with_ltdl             $have_ltdl
   LZMA              --with-lzma=$with_lzma             $have_lzma