diff options
| author | Dave Brolley <brolley@redhat.com> | 2009-05-06 11:19:32 -0400 |
|---|---|---|
| committer | Dave Brolley <brolley@redhat.com> | 2009-05-06 11:19:32 -0400 |
| commit | 07e1c7c9f0c0244530d4cb1f4a876355df1a2aec (patch) | |
| tree | 5743d35c33a0fb9615b0c560c57229d1ace7eade /configure.ac | |
| parent | aa4d7d17299550b06c33f386d2c5715f8250879f (diff) | |
| parent | ccf8bc85c08ba5602288caeb5062b3bf049a6960 (diff) | |
| download | systemtap-steved-07e1c7c9f0c0244530d4cb1f4a876355df1a2aec.tar.gz systemtap-steved-07e1c7c9f0c0244530d4cb1f4a876355df1a2aec.tar.xz systemtap-steved-07e1c7c9f0c0244530d4cb1f4a876355df1a2aec.zip | |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 31 |
1 files changed, 18 insertions, 13 deletions
diff --git a/configure.ac b/configure.ac index 129583e6..ab315c10 100644 --- a/configure.ac +++ b/configure.ac @@ -164,8 +164,7 @@ AC_ARG_ENABLE([docs], AC_CHECK_PROG(have_latex, latex, yes, no) AC_CHECK_PROG(have_dvips, dvips, yes, no) AC_CHECK_PROG(have_ps2pdf, ps2pdf, yes, no) -AC_CHECK_PROG(have_latex2html, latex2html, yes, no) -if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then +if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then if test "$enable_docs" == "yes"; then AC_MSG_ERROR([cannot find all tools for building documentation]) fi @@ -173,7 +172,7 @@ if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesye AC_MSG_WARN([will not build documentation, cannot find all tools]) fi fi -if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"; then +if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no"; then building_docs="yes" fi AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"]) @@ -189,13 +188,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 +216,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], |