diff options
Diffstat (limited to 'configure')
| -rwxr-xr-x | configure | 137 |
1 files changed, 50 insertions, 87 deletions
diff --git a/configure b/configure index dd64692345b..ffcd0c5b1d4 100755 --- a/configure +++ b/configure @@ -630,10 +630,9 @@ vpath_build PG_SYSROOT PG_VERSION_NUM PROVE +DBTOEPUB FOP XSLTPROC -DBTOEPUB -have_docbook XMLLINT TCL_SHLIB_LD_LIBS TCL_SHARED_BUILD @@ -18548,7 +18547,7 @@ fi fi # -# Check for DocBook and tools +# Check for documentation-building tools # if test -z "$XMLLINT"; then for ac_prog in xmllint @@ -18604,55 +18603,19 @@ $as_echo_n "checking for XMLLINT... " >&6; } $as_echo "$XMLLINT" >&6; } fi - -{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for DocBook XML V4.5" >&5 -$as_echo_n "checking for DocBook XML V4.5... " >&6; } -if ${pgac_cv_check_docbook+:} false; then : - $as_echo_n "(cached) " >&6 -else - cat >conftest.xml <<EOF -<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.5//EN" "http://www.oasis-open.org/docbook/xml/4.5/docbookx.dtd"> -<book> - <title>test</title> - <chapter> - <title>random</title> - <sect1> - <title>testsect</title> - <para>text</para> - </sect1> - </chapter> -</book> -EOF - -pgac_cv_check_docbook=no - -if test -n "$XMLLINT"; then - $XMLLINT --noout --valid conftest.xml 1>&5 2>&1 - if test $? -eq 0; then - pgac_cv_check_docbook=yes - fi -fi -rm -f conftest.xml -fi -{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $pgac_cv_check_docbook" >&5 -$as_echo "$pgac_cv_check_docbook" >&6; } - -have_docbook=$pgac_cv_check_docbook - - -if test -z "$DBTOEPUB"; then - for ac_prog in dbtoepub +if test -z "$XSLTPROC"; then + for ac_prog in xsltproc do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; 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_DBTOEPUB+:} false; then : +if ${ac_cv_path_XSLTPROC+:} false; then : $as_echo_n "(cached) " >&6 else - case $DBTOEPUB in + case $XSLTPROC in [\\/]* | ?:[\\/]*) - ac_cv_path_DBTOEPUB="$DBTOEPUB" # Let the user override the test with a path. + ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -18662,7 +18625,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_DBTOEPUB="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_XSLTPROC="$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 @@ -18673,40 +18636,40 @@ IFS=$as_save_IFS ;; esac fi -DBTOEPUB=$ac_cv_path_DBTOEPUB -if test -n "$DBTOEPUB"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5 -$as_echo "$DBTOEPUB" >&6; } +XSLTPROC=$ac_cv_path_XSLTPROC +if test -n "$XSLTPROC"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$DBTOEPUB" && break + test -n "$XSLTPROC" && break done else - # Report the value of DBTOEPUB in configure's output in all cases. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBTOEPUB" >&5 -$as_echo_n "checking for DBTOEPUB... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5 -$as_echo "$DBTOEPUB" >&6; } + # Report the value of XSLTPROC in configure's output in all cases. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSLTPROC" >&5 +$as_echo_n "checking for XSLTPROC... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 +$as_echo "$XSLTPROC" >&6; } fi -if test -z "$XSLTPROC"; then - for ac_prog in xsltproc +if test -z "$FOP"; then + for ac_prog in fop do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; 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_XSLTPROC+:} false; then : +if ${ac_cv_path_FOP+:} false; then : $as_echo_n "(cached) " >&6 else - case $XSLTPROC in + case $FOP in [\\/]* | ?:[\\/]*) - ac_cv_path_XSLTPROC="$XSLTPROC" # Let the user override the test with a path. + ac_cv_path_FOP="$FOP" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -18716,7 +18679,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_XSLTPROC="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_FOP="$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 @@ -18727,40 +18690,40 @@ IFS=$as_save_IFS ;; esac fi -XSLTPROC=$ac_cv_path_XSLTPROC -if test -n "$XSLTPROC"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } +FOP=$ac_cv_path_FOP +if test -n "$FOP"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 +$as_echo "$FOP" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$XSLTPROC" && break + test -n "$FOP" && break done else - # Report the value of XSLTPROC in configure's output in all cases. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for XSLTPROC" >&5 -$as_echo_n "checking for XSLTPROC... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $XSLTPROC" >&5 -$as_echo "$XSLTPROC" >&6; } + # Report the value of FOP in configure's output in all cases. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FOP" >&5 +$as_echo_n "checking for FOP... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 +$as_echo "$FOP" >&6; } fi -if test -z "$FOP"; then - for ac_prog in fop +if test -z "$DBTOEPUB"; then + for ac_prog in dbtoepub do # Extract the first word of "$ac_prog", so it can be a program name with args. set dummy $ac_prog; 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_FOP+:} false; then : +if ${ac_cv_path_DBTOEPUB+:} false; then : $as_echo_n "(cached) " >&6 else - case $FOP in + case $DBTOEPUB in [\\/]* | ?:[\\/]*) - ac_cv_path_FOP="$FOP" # Let the user override the test with a path. + ac_cv_path_DBTOEPUB="$DBTOEPUB" # Let the user override the test with a path. ;; *) as_save_IFS=$IFS; IFS=$PATH_SEPARATOR @@ -18770,7 +18733,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_FOP="$as_dir/$ac_word$ac_exec_ext" + ac_cv_path_DBTOEPUB="$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 @@ -18781,25 +18744,25 @@ IFS=$as_save_IFS ;; esac fi -FOP=$ac_cv_path_FOP -if test -n "$FOP"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 -$as_echo "$FOP" >&6; } +DBTOEPUB=$ac_cv_path_DBTOEPUB +if test -n "$DBTOEPUB"; then + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5 +$as_echo "$DBTOEPUB" >&6; } else { $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5 $as_echo "no" >&6; } fi - test -n "$FOP" && break + test -n "$DBTOEPUB" && break done else - # Report the value of FOP in configure's output in all cases. - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for FOP" >&5 -$as_echo_n "checking for FOP... " >&6; } - { $as_echo "$as_me:${as_lineno-$LINENO}: result: $FOP" >&5 -$as_echo "$FOP" >&6; } + # Report the value of DBTOEPUB in configure's output in all cases. + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DBTOEPUB" >&5 +$as_echo_n "checking for DBTOEPUB... " >&6; } + { $as_echo "$as_me:${as_lineno-$LINENO}: result: $DBTOEPUB" >&5 +$as_echo "$DBTOEPUB" >&6; } fi |