diff options
| -rw-r--r-- | Makefile.in | 1 | ||||
| -rwxr-xr-x | configure | 43 | ||||
| -rw-r--r-- | configure.ac | 5 | ||||
| -rw-r--r-- | doc/Makefile.in | 1 | ||||
| -rw-r--r-- | doc/SystemTap_Tapset_Reference/Makefile.in | 1 | ||||
| -rw-r--r-- | grapher/Makefile.in | 1 | ||||
| -rw-r--r-- | systemtap.spec | 2 |
7 files changed, 49 insertions, 5 deletions
diff --git a/Makefile.in b/Makefile.in index 9a6a11e1..0892715e 100644 --- a/Makefile.in +++ b/Makefile.in @@ -273,6 +273,7 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ +have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ have_xmlto = @have_xmlto@ host_alias = @host_alias@ @@ -665,6 +665,7 @@ BUILD_REFDOCS_TRUE have_xmlto BUILD_DOCS_FALSE BUILD_DOCS_TRUE +have_latex2html have_ps2pdf have_dvips have_latex @@ -6548,7 +6549,45 @@ $as_echo "no" >&6; } fi -if test "x${have_latex}${have_dvips}${have_ps2pdf}" != "xyesyesyes"; then +# Extract the first word of "latex2html", so it can be a program name with args. +set dummy latex2html; ac_word=$2 +{ $as_echo "$as_me:$LINENO: checking for $ac_word" >&5 +$as_echo_n "checking for $ac_word... " >&6; } +if test "${ac_cv_prog_have_latex2html+set}" = set; then + $as_echo_n "(cached) " >&6 +else + if test -n "$have_latex2html"; then + ac_cv_prog_have_latex2html="$have_latex2html" # Let the user override the test. +else +as_save_IFS=$IFS; IFS=$PATH_SEPARATOR +for as_dir in $PATH +do + IFS=$as_save_IFS + test -z "$as_dir" && as_dir=. + for ac_exec_ext in '' $ac_executable_extensions; do + if { test -f "$as_dir/$ac_word$ac_exec_ext" && $as_test_x "$as_dir/$ac_word$ac_exec_ext"; }; then + ac_cv_prog_have_latex2html="yes" + $as_echo "$as_me:$LINENO: found $as_dir/$ac_word$ac_exec_ext" >&5 + break 2 + fi +done +done +IFS=$as_save_IFS + + test -z "$ac_cv_prog_have_latex2html" && ac_cv_prog_have_latex2html="no" +fi +fi +have_latex2html=$ac_cv_prog_have_latex2html +if test -n "$have_latex2html"; then + { $as_echo "$as_me:$LINENO: result: $have_latex2html" >&5 +$as_echo "$have_latex2html" >&6; } +else + { $as_echo "$as_me:$LINENO: result: no" >&5 +$as_echo "no" >&6; } +fi + + +if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then if test "$enable_docs" == "yes"; then { { $as_echo "$as_me:$LINENO: error: cannot find all tools for building documentation" >&5 $as_echo "$as_me: error: cannot find all tools for building documentation" >&2;} @@ -6559,7 +6598,7 @@ $as_echo "$as_me: error: cannot find all tools for building documentation" >&2;} $as_echo "$as_me: WARNING: will not build documentation, cannot find all tools" >&2;} 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 if test "$building_docs" == "yes"; then 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"]) diff --git a/doc/Makefile.in b/doc/Makefile.in index d6ac3add..ac11ab4f 100644 --- a/doc/Makefile.in +++ b/doc/Makefile.in @@ -136,6 +136,7 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ +have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ have_xmlto = @have_xmlto@ host_alias = @host_alias@ diff --git a/doc/SystemTap_Tapset_Reference/Makefile.in b/doc/SystemTap_Tapset_Reference/Makefile.in index 705ddbae..7a5f0fe0 100644 --- a/doc/SystemTap_Tapset_Reference/Makefile.in +++ b/doc/SystemTap_Tapset_Reference/Makefile.in @@ -139,6 +139,7 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ +have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ have_xmlto = @have_xmlto@ host_alias = @host_alias@ diff --git a/grapher/Makefile.in b/grapher/Makefile.in index 90f95487..786719da 100644 --- a/grapher/Makefile.in +++ b/grapher/Makefile.in @@ -146,6 +146,7 @@ elfutils_abs_srcdir = @elfutils_abs_srcdir@ exec_prefix = @exec_prefix@ have_dvips = @have_dvips@ have_latex = @have_latex@ +have_latex2html = @have_latex2html@ have_ps2pdf = @have_ps2pdf@ have_xmlto = @have_xmlto@ host_alias = @host_alias@ diff --git a/systemtap.spec b/systemtap.spec index 447c88cb..77a170f8 100644 --- a/systemtap.spec +++ b/systemtap.spec @@ -44,7 +44,7 @@ Requires: crash %endif %if %{with_docs} -BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf +BuildRequires: /usr/bin/latex /usr/bin/dvips /usr/bin/ps2pdf latex2html # On F10, xmlto's pdf support was broken off into a sub-package, # called 'xmlto-tex'. To avoid a specific F10 BuildReq, we'll do a # file-based buildreq on '/usr/share/xmlto/format/fo/pdf'. |