diff --git a/configure b/configure
index b7b0104..9dabe2e 100755
--- a/configure
+++ b/configure
@@ -4387,7 +4387,7 @@
MAGICK_VERSION=7.0.0-0
-MAGICK_SVN_REVISION=18759:18767M
+MAGICK_SVN_REVISION=18759:18769M
# Substitute library versioning
@@ -29820,7 +29820,7 @@
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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
# 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 @@
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 @@
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 @@
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