From: cristy Date: Fri, 16 May 2014 12:21:48 +0000 (+0000) Subject: (no commit message) X-Git-Tag: 7.0.1-0~2343 X-Git-Url: https://granicus.if.org/sourcecode?a=commitdiff_plain;h=66f238eed79ac5b510397fb0761c980a74386693;p=imagemagick --- diff --git a/MagickCore/version.h b/MagickCore/version.h index a5f952a20..dc233e6eb 100644 --- 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 "15693M" +#define MagickSVNRevision "15718:15720M" #define MagickLibVersion 0x700 #define MagickLibVersionText "7.0.0" #define MagickLibVersionNumber 1,0,0 @@ -48,7 +48,7 @@ extern "C" { #define MagickppLibAddendum "-0" #define MagickppLibInterface 1 #define MagickppLibMinInterface 1 -#define MagickReleaseDate "2014-05-08" +#define MagickReleaseDate "2014-05-16" #define MagickChangeDate "20120427" #define MagickAuthoritativeURL "http://www.imagemagick.org" #define MagickFeatures "DPC HDRI OpenMP" diff --git a/config/delegates.xml.in b/config/delegates.xml.in index 2e0c668c0..948188ae6 100644 --- a/config/delegates.xml.in +++ b/config/delegates.xml.in @@ -73,6 +73,8 @@ + + diff --git a/configure b/configure index aa5538435..a0f4a967c 100755 --- a/configure +++ b/configure @@ -709,6 +709,7 @@ MVDelegate MrSIDDecodeDelegate MPEGEncodeDelegate MPEGDecodeDelegate +MogrifyDelegate MANDelegate LaunchDelegate LPRDelegate @@ -719,14 +720,14 @@ ILBMEncodeDelegate ILBMDecodeDelegate HTMLDecodeDelegate HPGLDecodeDelegate +GVCDecodeDelegate GnuplotDecodeDelegate -MogrifyDelegate -DisplayDelegate -ConvertDelegate EditorDelegate EchoDelegate +DisplayDelegate +ConvertDelegate DVIDecodeDelegate -GVCDecodeDelegate +DOCDecodeDelegate DNGDecodeDelegate CatDelegate BrowseDelegate @@ -3697,7 +3698,7 @@ MAGICK_PATCHLEVEL_VERSION=0 MAGICK_VERSION=7.0.0-0 -MAGICK_SVN_REVISION=15693M +MAGICK_SVN_REVISION=15718:15720M # Substitute library versioning @@ -32668,6 +32669,7 @@ BZIPDelegateDefault='bzip2' BrowseDelegateDefault='xdg-open' CatDelegateDefault='cat' DNGDecodeDelegateDefault='ufraw-batch' +DOCDecodeDelegateDefault='soffice' GVCDecodeDelegateDefault='dot' DVIDecodeDelegateDefault='dvips' EchoDelegateDefault='echo' @@ -32966,16 +32968,16 @@ $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 +# Extract the first word of ""$DOCDecodeDelegateDefault"", so it can be a program name with args. +set dummy "$DOCDecodeDelegateDefault"; 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_GVCDecodeDelegate+:} false; then : +if ${ac_cv_path_DOCDecodeDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $GVCDecodeDelegate in + case $DOCDecodeDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_GVCDecodeDelegate="$GVCDecodeDelegate" # Let the user override the test with a path. + ac_cv_path_DOCDecodeDelegate="$DOCDecodeDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -32985,7 +32987,7 @@ do 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_GVCDecodeDelegate="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_DOCDecodeDelegate="$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 @@ -32993,14 +32995,14 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_GVCDecodeDelegate" && ac_cv_path_GVCDecodeDelegate=""$GVCDecodeDelegateDefault"" + test -z "$ac_cv_path_DOCDecodeDelegate" && ac_cv_path_DOCDecodeDelegate=""$DOCDecodeDelegateDefault"" ;; esac fi -GVCDecodeDelegate=$ac_cv_path_GVCDecodeDelegate -if test -n "$GVCDecodeDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GVCDecodeDelegate" >&5 -$as_echo "$GVCDecodeDelegate" >&6; } +DOCDecodeDelegate=$ac_cv_path_DOCDecodeDelegate +if test -n "$DOCDecodeDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DOCDecodeDelegate" >&5 +$as_echo "$DOCDecodeDelegate" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -33048,16 +33050,16 @@ $as_echo "no" >&6; } fi -# Extract the first word of ""$EchoDelegateDefault"", so it can be a program name with args. -set dummy "$EchoDelegateDefault"; ac_word=$2 +# Extract the first word of ""$ConvertDelegateDefault"", so it can be a program name with args. +set dummy "$ConvertDelegateDefault"; 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_EchoDelegate+:} false; then : +if ${ac_cv_path_ConvertDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $EchoDelegate in + case $ConvertDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_EchoDelegate="$EchoDelegate" # Let the user override the test with a path. + ac_cv_path_ConvertDelegate="$ConvertDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -33067,7 +33069,7 @@ do 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_EchoDelegate="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_ConvertDelegate="$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 @@ -33075,30 +33077,30 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_EchoDelegate" && ac_cv_path_EchoDelegate=""$EchoDelegateDefault"" + test -z "$ac_cv_path_ConvertDelegate" && ac_cv_path_ConvertDelegate=""$ConvertDelegateDefault"" ;; esac fi -EchoDelegate=$ac_cv_path_EchoDelegate -if test -n "$EchoDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EchoDelegate" >&5 -$as_echo "$EchoDelegate" >&6; } +ConvertDelegate=$ac_cv_path_ConvertDelegate +if test -n "$ConvertDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ConvertDelegate" >&5 +$as_echo "$ConvertDelegate" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of ""$EditorDelegateDefault"", so it can be a program name with args. -set dummy "$EditorDelegateDefault"; ac_word=$2 +# Extract the first word of ""$DisplayDelegateDefault"", so it can be a program name with args. +set dummy "$DisplayDelegateDefault"; 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_EditorDelegate+:} false; then : +if ${ac_cv_path_DisplayDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $EditorDelegate in + case $DisplayDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_EditorDelegate="$EditorDelegate" # Let the user override the test with a path. + ac_cv_path_DisplayDelegate="$DisplayDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -33108,7 +33110,7 @@ do 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_EditorDelegate="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_DisplayDelegate="$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 @@ -33116,30 +33118,30 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_EditorDelegate" && ac_cv_path_EditorDelegate=""$EditorDelegateDefault"" + test -z "$ac_cv_path_DisplayDelegate" && ac_cv_path_DisplayDelegate=""$DisplayDelegateDefault"" ;; esac fi -EditorDelegate=$ac_cv_path_EditorDelegate -if test -n "$EditorDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EditorDelegate" >&5 -$as_echo "$EditorDelegate" >&6; } +DisplayDelegate=$ac_cv_path_DisplayDelegate +if test -n "$DisplayDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DisplayDelegate" >&5 +$as_echo "$DisplayDelegate" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of ""$ConvertDelegateDefault"", so it can be a program name with args. -set dummy "$ConvertDelegateDefault"; ac_word=$2 +# Extract the first word of ""$EchoDelegateDefault"", so it can be a program name with args. +set dummy "$EchoDelegateDefault"; 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_ConvertDelegate+:} false; then : +if ${ac_cv_path_EchoDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $ConvertDelegate in + case $EchoDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_ConvertDelegate="$ConvertDelegate" # Let the user override the test with a path. + ac_cv_path_EchoDelegate="$EchoDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -33149,7 +33151,7 @@ do 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_ConvertDelegate="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_EchoDelegate="$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 @@ -33157,30 +33159,30 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_ConvertDelegate" && ac_cv_path_ConvertDelegate=""$ConvertDelegateDefault"" + test -z "$ac_cv_path_EchoDelegate" && ac_cv_path_EchoDelegate=""$EchoDelegateDefault"" ;; esac fi -ConvertDelegate=$ac_cv_path_ConvertDelegate -if test -n "$ConvertDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $ConvertDelegate" >&5 -$as_echo "$ConvertDelegate" >&6; } +EchoDelegate=$ac_cv_path_EchoDelegate +if test -n "$EchoDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EchoDelegate" >&5 +$as_echo "$EchoDelegate" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of ""$DisplayDelegateDefault"", so it can be a program name with args. -set dummy "$DisplayDelegateDefault"; ac_word=$2 +# Extract the first word of ""$EditorDelegateDefault"", so it can be a program name with args. +set dummy "$EditorDelegateDefault"; 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_DisplayDelegate+:} false; then : +if ${ac_cv_path_EditorDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $DisplayDelegate in + case $EditorDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_DisplayDelegate="$DisplayDelegate" # Let the user override the test with a path. + ac_cv_path_EditorDelegate="$EditorDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -33190,7 +33192,7 @@ do 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_DisplayDelegate="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_EditorDelegate="$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 @@ -33198,30 +33200,30 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_DisplayDelegate" && ac_cv_path_DisplayDelegate=""$DisplayDelegateDefault"" + test -z "$ac_cv_path_EditorDelegate" && ac_cv_path_EditorDelegate=""$EditorDelegateDefault"" ;; esac fi -DisplayDelegate=$ac_cv_path_DisplayDelegate -if test -n "$DisplayDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DisplayDelegate" >&5 -$as_echo "$DisplayDelegate" >&6; } +EditorDelegate=$ac_cv_path_EditorDelegate +if test -n "$EditorDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $EditorDelegate" >&5 +$as_echo "$EditorDelegate" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi -# Extract the first word of ""$MogrifyDelegateDefault"", so it can be a program name with args. -set dummy "$MogrifyDelegateDefault"; ac_word=$2 +# 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_MogrifyDelegate+:} false; then : +if ${ac_cv_path_GnuplotDecodeDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $MogrifyDelegate in + case $GnuplotDecodeDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_MogrifyDelegate="$MogrifyDelegate" # Let the user override the test with a path. + ac_cv_path_GnuplotDecodeDelegate="$GnuplotDecodeDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -33231,7 +33233,7 @@ do 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_MogrifyDelegate="$as_dir/$ac_word$ac_exec_ext" + 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 @@ -33239,30 +33241,30 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_MogrifyDelegate" && ac_cv_path_MogrifyDelegate=""$MogrifyDelegateDefault"" + test -z "$ac_cv_path_GnuplotDecodeDelegate" && ac_cv_path_GnuplotDecodeDelegate=""$GnuplotDecodeDelegateDefault"" ;; esac fi -MogrifyDelegate=$ac_cv_path_MogrifyDelegate -if test -n "$MogrifyDelegate"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MogrifyDelegate" >&5 -$as_echo "$MogrifyDelegate" >&6; } +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 ""$GnuplotDecodeDelegateDefault"", so it can be a program name with args. -set dummy "$GnuplotDecodeDelegateDefault"; ac_word=$2 +# 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 $as_echo_n "checking for $ac_word... " >&6; } -if ${ac_cv_path_GnuplotDecodeDelegate+:} false; then : +if ${ac_cv_path_GVCDecodeDelegate+:} false; then : $as_echo_n "(cached) " >&6 else - case $GnuplotDecodeDelegate in + case $GVCDecodeDelegate in [\\/]* | ?:[\\/]*) - ac_cv_path_GnuplotDecodeDelegate="$GnuplotDecodeDelegate" # Let the user override the test with a path. + ac_cv_path_GVCDecodeDelegate="$GVCDecodeDelegate" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -33272,7 +33274,7 @@ do 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" + ac_cv_path_GVCDecodeDelegate="$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 @@ -33280,14 +33282,14 @@ done done IFS=$as_save_IFS - test -z "$ac_cv_path_GnuplotDecodeDelegate" && ac_cv_path_GnuplotDecodeDelegate=""$GnuplotDecodeDelegateDefault"" + test -z "$ac_cv_path_GVCDecodeDelegate" && ac_cv_path_GVCDecodeDelegate=""$GVCDecodeDelegateDefault"" ;; 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; } +GVCDecodeDelegate=$ac_cv_path_GVCDecodeDelegate +if test -n "$GVCDecodeDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $GVCDecodeDelegate" >&5 +$as_echo "$GVCDecodeDelegate" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } @@ -33704,6 +33706,47 @@ $as_echo "no" >&6; } fi +# Extract the first word of ""$MogrifyDelegateDefault"", so it can be a program name with args. +set dummy "$MogrifyDelegateDefault"; 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_MogrifyDelegate+:} false; then : + $as_echo_n "(cached) " >&6 +else + case $MogrifyDelegate in + [\\/]* | ?:[\\/]*) + ac_cv_path_MogrifyDelegate="$MogrifyDelegate" # 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_MogrifyDelegate="$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_MogrifyDelegate" && ac_cv_path_MogrifyDelegate=""$MogrifyDelegateDefault"" + ;; +esac +fi +MogrifyDelegate=$ac_cv_path_MogrifyDelegate +if test -n "$MogrifyDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $MogrifyDelegate" >&5 +$as_echo "$MogrifyDelegate" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of ""$MPEGDecodeDelegateDefault"", so it can be a program name with args. set dummy "$MPEGDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -34795,6 +34838,7 @@ if test "$with_frozenpaths" != 'yes'; then ConvertDelegate="$ConvertDelegateDefault" DisplayDelegate="$DisplayDelegateDefault" DNGDecodeDelegate="$DNGDecodeDelegateDefault" + DOCDecodeDelegate="$DOCDecodeDelegateDefault" DVIDecodeDelegate="$DVIDecodeDelegateDefault" EchoDelegate="$EchoDelegateDefault" EditorDelegate="$EditorDelegateDefault" diff --git a/configure.ac b/configure.ac index 31937da62..9d85726fc 100755 --- a/configure.ac +++ b/configure.ac @@ -3196,6 +3196,7 @@ BZIPDelegateDefault='bzip2' BrowseDelegateDefault='xdg-open' CatDelegateDefault='cat' DNGDecodeDelegateDefault='ufraw-batch' +DOCDecodeDelegateDefault='soffice' GVCDecodeDelegateDefault='dot' DVIDecodeDelegateDefault='dvips' EchoDelegateDefault='echo' @@ -3249,14 +3250,14 @@ AC_PATH_PROG(BZIPDelegate, "$BZIPDelegateDefault", "$BZIPDelegateDefault") AC_PATH_PROGS(BrowseDelegate, "$BrowseDelegateDefault" google-chrome firefox konqueror mozilla lynx, "$BrowseDelegateDefault") AC_PATH_PROG(CatDelegate, "$CatDelegateDefault", "$CatDelegateDefault") AC_PATH_PROG(DNGDecodeDelegate, "$DNGDecodeDelegateDefault", "$DNGDecodeDelegateDefault") -AC_PATH_PROG(GVCDecodeDelegate, "$GVCDecodeDelegateDefault", "$GVCDecodeDelegateDefault") +AC_PATH_PROG(DOCDecodeDelegate, "$DOCDecodeDelegateDefault", "$DOCDecodeDelegateDefault") AC_PATH_PROG(DVIDecodeDelegate, "$DVIDecodeDelegateDefault", "$DVIDecodeDelegateDefault") -AC_PATH_PROG(EchoDelegate, "$EchoDelegateDefault", "$EchoDelegateDefault") -AC_PATH_PROG(EditorDelegate, "$EditorDelegateDefault", "$EditorDelegateDefault") AC_PATH_PROG(ConvertDelegate, "$ConvertDelegateDefault", "$ConvertDelegateDefault") AC_PATH_PROG(DisplayDelegate, "$DisplayDelegateDefault", "$DisplayDelegateDefault") -AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault") +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") AC_PATH_PROG(ILBMDecodeDelegate, "$ILBMDecodeDelegateDefault", "$ILBMDecodeDelegateDefault") @@ -3267,6 +3268,7 @@ AC_PATH_PROG(LPDelegate, "$LPDelegateDefault", no) AC_PATH_PROG(LPRDelegate, "$LPRDelegateDefault", "$LPRDelegateDefault") AC_PATH_PROG(LaunchDelegate, "$LaunchDelegateDefault", "$LaunchDelegateDefault") AC_PATH_PROG(MANDelegate, "$MANDelegateDefault", "$MANDelegateDefault") +AC_PATH_PROG(MogrifyDelegate, "$MogrifyDelegateDefault", "$MogrifyDelegateDefault") AC_PATH_PROG(MPEGDecodeDelegate, "$MPEGDecodeDelegateDefault", "$MPEGDecodeDelegateDefault") if test "$MPEGDecodeDelegate" == "$MPEGDecodeDelegateDefault" ; then MPEGDecodeDelegateDefault='ffmpeg' @@ -3427,6 +3429,7 @@ if test "$with_frozenpaths" != 'yes'; then ConvertDelegate="$ConvertDelegateDefault" DisplayDelegate="$DisplayDelegateDefault" DNGDecodeDelegate="$DNGDecodeDelegateDefault" + DOCDecodeDelegate="$DOCDecodeDelegateDefault" DVIDecodeDelegate="$DVIDecodeDelegateDefault" EchoDelegate="$EchoDelegateDefault" EditorDelegate="$EditorDelegateDefault"