Update to the latest autoconf / automake
diff --git a/Makefile.in b/Makefile.in
index 7132eb4..3dc325e 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -2574,7 +2574,6 @@
GVCDecodeDelegate = @GVCDecodeDelegate@
GVC_CFLAGS = @GVC_CFLAGS@
GVC_LIBS = @GVC_LIBS@
-GnuplotDecodeDelegate = @GnuplotDecodeDelegate@
HPGLDecodeDelegate = @HPGLDecodeDelegate@
HTMLDecodeDelegate = @HTMLDecodeDelegate@
ILBMDecodeDelegate = @ILBMDecodeDelegate@
diff --git a/config/delegates.xml.in b/config/delegates.xml.in
index 25d9290..ecee3a2 100644
--- a/config/delegates.xml.in
+++ b/config/delegates.xml.in
@@ -102,7 +102,6 @@
<delegate decode="pcl:mono" stealth="True" command=""@PCLDelegate@" -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@PCLMonoDevice@" -dTextAlphaBits=%u -dGraphicsAlphaBits=%u "-r%s" %s "-sOutputFile=%s" "%s""/>
<delegate decode="pdf" encode="eps" mode="bi" command=""@PSDelegate@" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSEPSDevice@" "-sOutputFile=%o" "-f%i""/>
<delegate decode="pdf" encode="ps" mode="bi" command=""@PSDelegate@" -q -dQUIET -dSAFER -dBATCH -dNOPAUSE -dNOPROMPT -dMaxBitmap=500000000 -dAlignToPixels=0 -dGridFitTT=2 "-sDEVICE=@GSPSDevice@" "-sOutputFile=%o" "-f%i""/>
- <delegate decode="plt" command=""@EchoDelegate@" "set size 1.25,0.62; set terminal postscript portrait color solid; set output \'%o\'; load \'%i\'" > "%u";"@GnuplotDecodeDelegate@" "%u""/>
<delegate decode="png" encode="webp" command=""@WebPEncodeDelegate@" -quiet -q %Q "%i" -o "%o""/>
<delegate decode="pnm" encode="ilbm" mode="encode" command=""@ILBMEncodeDelegate@" -24if "%i" > "%o""/>
<delegate decode="bmp" encode="jxr" command="mv "%i" "%i.bmp"; "@JXREncodeDelegate@" -i "%i.bmp" -o "%o.jxr"; mv "%i.bmp" "%i"; mv "%o.jxr" "%o""/>
diff --git a/configure b/configure
index a76e5f1..7f0c9da 100755
--- a/configure
+++ b/configure
@@ -722,7 +722,6 @@
HTMLDecodeDelegate
HPGLDecodeDelegate
GVCDecodeDelegate
-GnuplotDecodeDelegate
EditorDelegate
EchoDelegate
DisplayDelegate
@@ -4528,7 +4527,7 @@
MAGICK_VERSION=7.0.1-2
-MAGICK_GIT_REVISION=18104:9cdadd9:20160504
+MAGICK_GIT_REVISION=18107:f7f737e:20160505
# Substitute library versioning
@@ -34613,7 +34612,6 @@
ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
-GnuplotDecodeDelegateDefault='gnuplot'
HPGLDecodeDelegateDefault='hp2xx'
HTMLDecodeDelegateDefault='html2ps'
ILBMDecodeDelegateDefault='ilbmtoppm'
@@ -35232,47 +35230,6 @@
fi
-# Extract the first word of ""$GnuplotDecodeDelegateDefault"", so it can be a program name with args.
-set dummy "$GnuplotDecodeDelegateDefault"; ac_word=$2
-{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
-$as_echo_n "checking for $ac_word... " >&6; }
-if ${ac_cv_path_GnuplotDecodeDelegate+:} false; then :
- $as_echo_n "(cached) " >&6
-else
- case $GnuplotDecodeDelegate in
- [\\/]* | ?:[\\/]*)
- ac_cv_path_GnuplotDecodeDelegate="$GnuplotDecodeDelegate" # Let the user override the test with a path.
- ;;
- *)
- as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
-for as_dir in $PATH
-do
- IFS=$as_save_IFS
- test -z "$as_dir" && as_dir=.
- for ac_exec_ext in '' $ac_executable_extensions; do
- if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
- ac_cv_path_GnuplotDecodeDelegate="$as_dir/$ac_word$ac_exec_ext"
- $as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
- break 2
- fi
-done
- done
-IFS=$as_save_IFS
-
- test -z "$ac_cv_path_GnuplotDecodeDelegate" && ac_cv_path_GnuplotDecodeDelegate=""$GnuplotDecodeDelegateDefault""
- ;;
-esac
-fi
-GnuplotDecodeDelegate=$ac_cv_path_GnuplotDecodeDelegate
-if test -n "$GnuplotDecodeDelegate"; then
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GnuplotDecodeDelegate" >&5
-$as_echo "$GnuplotDecodeDelegate" >&6; }
-else
- { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
-$as_echo "no" >&6; }
-fi
-
-
# Extract the first word of ""$GVCDecodeDelegateDefault"", so it can be a program name with args.
set dummy "$GVCDecodeDelegateDefault"; ac_word=$2
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
@@ -36889,7 +36846,6 @@
DVIDecodeDelegate="$DVIDecodeDelegateDefault"
EchoDelegate="$EchoDelegateDefault"
EditorDelegate="$EditorDelegateDefault"
- GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault"
GVCDecodeDelegate="$GVCDecodeDelegateDefault"
HPGLDecodeDelegate="$HPGLDecodeDelegateDefault"
HTMLDecodeDelegate="$HTMLDecodeDelegateDefault"
@@ -36969,7 +36925,6 @@
-
#
# RPM support.
#
diff --git a/configure.ac b/configure.ac
index f15c237..d922cc7 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3031,7 +3031,6 @@
ConvertDelegateDefault=`echo convert | sed ${configure_transform_name}`
DisplayDelegateDefault=`echo display | sed ${configure_transform_name}`
MogrifyDelegateDefault=`echo mogrify | sed ${configure_transform_name}`
-GnuplotDecodeDelegateDefault='gnuplot'
HPGLDecodeDelegateDefault='hp2xx'
HTMLDecodeDelegateDefault='html2ps'
ILBMDecodeDelegateDefault='ilbmtoppm'
@@ -3085,7 +3084,6 @@
AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault")
AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault")
AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault")
-AC_PATH_PROG(GnuplotDecodeDelegate, "$GnuplotDecodeDelegateDefault", "$GnuplotDecodeDelegateDefault")
AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault")
AC_PATH_PROG(HPGLDecodeDelegate, "$HPGLDecodeDelegateDefault", "$HPGLDecodeDelegateDefault")
AC_PATH_PROG(HTMLDecodeDelegate, "$HTMLDecodeDelegateDefault", "$HTMLDecodeDelegateDefault")
@@ -3285,7 +3283,6 @@
DVIDecodeDelegate="$DVIDecodeDelegateDefault"
EchoDelegate="$EchoDelegateDefault"
EditorDelegate="$EditorDelegateDefault"
- GnuplotDecodeDelegate="$GnuplotDecodeDelegateDefault"
GVCDecodeDelegate="$GVCDecodeDelegateDefault"
HPGLDecodeDelegate="$HPGLDecodeDelegateDefault"
HTMLDecodeDelegate="$HTMLDecodeDelegateDefault"
@@ -3334,7 +3331,6 @@
AC_SUBST(DVIDecodeDelegate)
AC_SUBST(EchoDelegate)
AC_SUBST(EditorDelegate)
-AC_SUBST(GnuplotDecodeDelegate)
AC_SUBST(HPGLDecodeDelegate)
AC_SUBST(HTMLDecodeDelegate)
AC_SUBST(ILBMDecodeDelegate)