From 5ac9ac84664e557e340c68b9c3fb74965bac2710 Mon Sep 17 00:00:00 2001 From: cristy Date: Thu, 29 Jul 2010 13:24:24 +0000 Subject: [PATCH] --- config/delegates.xml.in | 3 ++- configure | 45 +++++++++++++++++++++++++++++++++++++++++ configure.ac | 4 ++++ 3 files changed, 51 insertions(+), 1 deletion(-) diff --git a/config/delegates.xml.in b/config/delegates.xml.in index b3813614a..9ed8f9077 100644 --- a/config/delegates.xml.in +++ b/config/delegates.xml.in @@ -63,6 +63,7 @@ + @@ -72,7 +73,7 @@ - + diff --git a/configure b/configure index 69ea3be37..57f1c7c38 100755 --- a/configure +++ b/configure @@ -672,6 +672,7 @@ ZipDelegate XPSDelegate WWWDecodeDelegate WMFDecodeDelegate +UniconvertorDelegate TXTDelegate SCANDecodeDelegate RSVGDecodeDelegate @@ -29511,6 +29512,7 @@ RMDelegateDefault='rm' RSVGDecodeDelegateDefault='rsvg' SCANDecodeDelegateDefault='scanimage' TXTDelegateDefault='enscript' +UniconverterDelegateDefault='uniconvertor' WMFDecodeDelegateDefault='wmf2eps' WWWDecodeDelegateDefault='curl' XPSDelegateDefault='gxps' @@ -31203,6 +31205,47 @@ $as_echo "no" >&6; } fi +# Extract the first word of ""$UniconvertorDelegateDefault"", so it can be a program name with args. +set dummy "$UniconvertorDelegateDefault"; ac_word=$2 +{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_path_UniconvertorDelegate+set}" = set; then : + $as_echo_n "(cached) " >&6 +else + case $UniconvertorDelegate in + [\\/]* | ?:[\\/]*) + ac_cv_path_UniconvertorDelegate="$UniconvertorDelegate" # 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 { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_path_UniconvertorDelegate="$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_UniconvertorDelegate" && ac_cv_path_UniconvertorDelegate=""$UniconvertorDelegateDefault"" + ;; +esac +fi +UniconvertorDelegate=$ac_cv_path_UniconvertorDelegate +if test -n "$UniconvertorDelegate"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $UniconvertorDelegate" >&5 +$as_echo "$UniconvertorDelegate" >&6; } +else + { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 +$as_echo "no" >&6; } +fi + + # Extract the first word of ""$WMFDecodeDelegateDefault"", so it can be a program name with args. set dummy "$WMFDecodeDelegateDefault"; ac_word=$2 { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5 @@ -31539,6 +31582,7 @@ if test "$with_frozenpaths" != 'yes'; then SCANDecodeDelegate="$SCANDecodeDelegateDefault" ShowImageDelegate="$ShowImageDelegateDefault" TXTDelegate="$TXTDelegateDefault" + UniconvertorDelegate="$UniconvertorDelegateDefault" WMFDecodeDelegate="$WMFDecodeDelegateDefault" WWWDecodeDelegate="$WWWDecodeDelegateDefault" XPSDelegate="$XPSDelegateDefault" @@ -31587,6 +31631,7 @@ fi + # diff --git a/configure.ac b/configure.ac index 5975c2fb4..6a818a28b 100755 --- a/configure.ac +++ b/configure.ac @@ -2736,6 +2736,7 @@ RMDelegateDefault='rm' RSVGDecodeDelegateDefault='rsvg' SCANDecodeDelegateDefault='scanimage' TXTDelegateDefault='enscript' +UniconverterDelegateDefault='uniconvertor' WMFDecodeDelegateDefault='wmf2eps' WWWDecodeDelegateDefault='curl' XPSDelegateDefault='gxps' @@ -2783,6 +2784,7 @@ AC_PATH_PROG(RMDelegate, "$RMDelegateDefault", "$RMDelegateDefault") AC_PATH_PROG(RSVGDecodeDelegate, "$RSVGDecodeDelegateDefault", "$RSVGDecodeDelegateDefault") AC_PATH_PROG(SCANDecodeDelegate, "$SCANDecodeDelegateDefault", "$SCANDecodeDelegateDefault") AC_PATH_PROG(TXTDelegate, "$TXTDelegateDefault", "$TXTDelegateDefault") +AC_PATH_PROG(UniconvertorDelegate, "$UniconvertorDelegateDefault", "$UniconvertorDelegateDefault") AC_PATH_PROG(WMFDecodeDelegate, "$WMFDecodeDelegateDefault", "$WMFDecodeDelegateDefault") AC_PATH_PROG(WWWDecodeDelegate, "$WWWDecodeDelegateDefault", "$WWWDecodeDelegateDefault") AC_PATH_PROG(XPSDelegate, "$XPSDelegateDefault", "$XPSDelegateDefault") @@ -2953,6 +2955,7 @@ if test "$with_frozenpaths" != 'yes'; then SCANDecodeDelegate="$SCANDecodeDelegateDefault" ShowImageDelegate="$ShowImageDelegateDefault" TXTDelegate="$TXTDelegateDefault" + UniconvertorDelegate="$UniconvertorDelegateDefault" WMFDecodeDelegate="$WMFDecodeDelegateDefault" WWWDecodeDelegate="$WWWDecodeDelegateDefault" XPSDelegate="$XPSDelegateDefault" @@ -2998,6 +3001,7 @@ AC_SUBST(RMDelegate) AC_SUBST(SCANDecodeDelegate) AC_SUBST(ShowImageDelegate) AC_SUBST(TXTDelegate) +AC_SUBST(UniconvertorDelegate) AC_SUBST(WMFDecodeDelegate) AC_SUBST(WWWDecodeDelegate) AC_SUBST(XPSDelegate) -- 2.40.0