diff options
author | Dave Brolley <brolley@redhat.com> | 2009-05-06 13:53:44 -0400 |
---|---|---|
committer | Dave Brolley <brolley@redhat.com> | 2009-05-06 13:53:44 -0400 |
commit | a6b4f9682a51062a18042f3feb6b80aa40412625 (patch) | |
tree | f79313f7ee1302b075adcabe1abfcd9c8df05f98 /configure.ac | |
parent | 67c7a9ac91ea3de5cadb7c90028365fdac1f530f (diff) | |
parent | b62c413b3be70e525bb7d7dc42913beaae060d63 (diff) | |
download | systemtap-steved-a6b4f9682a51062a18042f3feb6b80aa40412625.tar.gz systemtap-steved-a6b4f9682a51062a18042f3feb6b80aa40412625.tar.xz systemtap-steved-a6b4f9682a51062a18042f3feb6b80aa40412625.zip |
Merge branch 'master' of ssh://sources.redhat.com/git/systemtap
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/configure.ac b/configure.ac index ab315c10..e8a8efda 100644 --- a/configure.ac +++ b/configure.ac @@ -164,7 +164,8 @@ 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) -if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then +AC_CHECK_PROG(have_latex2html, latex2html, yes, no) +if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then if test "$enable_docs" == "yes"; then AC_MSG_ERROR([cannot find all tools for building documentation]) fi @@ -172,7 +173,7 @@ if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then AC_MSG_WARN([will not build documentation, cannot find all tools]) fi fi -if test "x${have_latex}${have_dvips}${have_ps2pdf}" == "xyesyesyes" -a "$enable_docs" != "no"; then +if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"; then building_docs="yes" fi AM_CONDITIONAL([BUILD_DOCS], [test "$building_docs" == "yes"]) |