diff options
| author | Will Cohen <wcohen@peloton.usersys.redhat.com> | 2009-01-08 14:28:15 -0500 |
|---|---|---|
| committer | Will Cohen <wcohen@peloton.usersys.redhat.com> | 2009-01-08 14:28:15 -0500 |
| commit | aa5951be9f4f12139cdcec4a501754a62b88c28b (patch) | |
| tree | 64fbc5da1d94f9c187194403b7bdcc32aa96751b | |
| parent | b2aa7e450bd6de4e329f9edf1aa7cb540a6ec713 (diff) | |
| download | systemtap-steved-aa5951be9f4f12139cdcec4a501754a62b88c28b.tar.gz systemtap-steved-aa5951be9f4f12139cdcec4a501754a62b88c28b.tar.xz systemtap-steved-aa5951be9f4f12139cdcec4a501754a62b88c28b.zip | |
Check for xmlto that generates pdf.
| -rw-r--r-- | ChangeLog | 5 | ||||
| -rwxr-xr-x | configure | 28 | ||||
| -rw-r--r-- | configure.ac | 23 |
3 files changed, 49 insertions, 7 deletions
@@ -1,3 +1,8 @@ +2009-01-08 William Cohen <wcohen@redhat.com> + + * configure.ac: Check for xmlto that generates pdf. + * configure: Regenerated. + 2009-01-07 William Cohen <wcohen@redhat.com> * configure.ac: Add --enable-refdocs configure option and @@ -6472,14 +6472,34 @@ echo "${ECHO_T}no" >&6; } fi +if test "x${have_xmlto}" == "xyes"; then +{ echo "$as_me:$LINENO: checking for xmlto pdf support" >&5 +echo $ECHO_N "checking for xmlto pdf support... $ECHO_C" >&6; } +cat > conftest.$ac_ext << EOF +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" > + <book id="pdffromxml"> + </book> +EOF + xmlto pdf conftest.$ac_ext >& /dev/null + if test $? == 0; then + have_xmlto_pdf="yes" + { echo "$as_me:$LINENO: result: yes" >&5 +echo "${ECHO_T}yes" >&6; } + else + { echo "$as_me:$LINENO: result: no" >&5 +echo "${ECHO_T}no" >&6; } + fi +fi if test "$enable_refdocs" == "yes"; then - if test "x${have_xmlto}" != "xyes"; then - { { echo "$as_me:$LINENO: error: cannot find xmlto for building reference documentation" >&5 -echo "$as_me: error: cannot find xmlto for building reference documentation" >&2;} + if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then + { { echo "$as_me:$LINENO: error: cannot find proper yxmlto for building reference documentation" >&5 +echo "$as_me: error: cannot find proper yxmlto for building reference documentation" >&2;} { (exit 1); exit 1; }; } fi fi -if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then +if test "x${have_xmlto}${have_xmlto_pdf}" == "xyesyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then building_refdocs="yes" fi if test "$building_refdocs" == "yes"; then diff --git a/configure.ac b/configure.ac index 4cb2948a..7866fe96 100644 --- a/configure.ac +++ b/configure.ac @@ -179,12 +179,29 @@ if test "$building_docs" == "no" -a "$enable_refdocs" == "yes" ; then AC_MSG_ERROR([must use --enable-docs with --enable-refdocs]) fi AC_CHECK_PROG(have_xmlto, xmlto, yes, no) +if test "x${have_xmlto}" == "xyes"; then +AC_MSG_CHECKING([for xmlto pdf support]) +cat > conftest.$ac_ext << EOF +<?xml version="1.0" encoding="UTF-8"?> +<!DOCTYPE book PUBLIC "-//OASIS//DTD DocBook XML V4.1.2//EN" +"http://www.oasis-open.org/docbook/xml/4.1.2/docbookx.dtd" []> + <book id="pdffromxml"> + </book> +EOF + xmlto pdf conftest.$ac_ext >& /dev/null + if test $? == 0; then + have_xmlto_pdf="yes" + AC_MSG_RESULT([yes]) + else + AC_MSG_RESULT([no]) + fi +fi if test "$enable_refdocs" == "yes"; then - if test "x${have_xmlto}" != "xyes"; then - AC_MSG_ERROR([cannot find xmlto for building reference documentation]) + if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then + AC_MSG_ERROR([cannot find proper yxmlto for building reference documentation]) fi fi -if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then +if test "x${have_xmlto}${have_xmlto_pdf}" == "xyesyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then building_refdocs="yes" fi AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) |