diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-05-06 15:14:52 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-05-06 15:14:52 -0400 |
| commit | 524c5a9dbab620f3812bab61ecfe01ba2a893d20 (patch) | |
| tree | 5dc6ad11f0b4d3076305071ce2756f80deecdfe6 /configure.ac | |
| parent | 6855a305faa34df80944f105382d45230b7b82ac (diff) | |
| parent | a6b4f9682a51062a18042f3feb6b80aa40412625 (diff) | |
| download | systemtap-steved-524c5a9dbab620f3812bab61ecfe01ba2a893d20.tar.gz systemtap-steved-524c5a9dbab620f3812bab61ecfe01ba2a893d20.tar.xz systemtap-steved-524c5a9dbab620f3812bab61ecfe01ba2a893d20.zip | |
Merge branch 'master' of git://sources.redhat.com/git/systemtap
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 26 |
1 files changed, 16 insertions, 10 deletions
diff --git a/configure.ac b/configure.ac index 129583e6..e8a8efda 100644 --- a/configure.ac +++ b/configure.ac @@ -189,13 +189,26 @@ 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 +if test "$enable_refdocs" == "yes"; then + if test "x${have_xmlto}" != "xyes"; then + AC_MSG_ERROR([cannot find xmlto for building reference documentation]) + fi +fi +if test "x${have_xmlto}" == "xyes" -a "$enable_refdocs" != "no" -a "${building_docs}" == "yes"; then + building_refdocs="yes" +fi +AM_CONDITIONAL([BUILD_REFDOCS], [test "$building_refdocs" == "yes"]) + +if test "x${building_refdocs}" == "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"> + <bookinfo> + <title>test</title> + </bookinfo> </book> EOF xmlto pdf conftest.$ac_ext >& /dev/null @@ -204,17 +217,10 @@ EOF AC_MSG_RESULT([yes]) else AC_MSG_RESULT([no]) + AC_MSG_WARN([Not building reference documentation in PDF format]) fi fi -if test "$enable_refdocs" == "yes"; then - if test "x${have_xmlto}${have_xmlto_pdf}" != "xyesyes"; then - AC_MSG_ERROR([cannot find proper xmlto for building reference documentation]) - fi -fi -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"]) +AM_CONDITIONAL([BUILD_PDFREFDOCS], [test "have_xmlto_pdf" == "yes"]) dnl Handle the option to build the server setup. AC_ARG_ENABLE([server], |