From 2d4b8ddfb72206a2e0fc4b500e54602a1f6ba189 Mon Sep 17 00:00:00 2001 From: Mark Wielaard Date: Wed, 7 Jan 2009 16:44:02 +0100 Subject: Warn when not building docs because tools not found. --- ChangeLog | 5 +++++ configure | 8 ++++++-- configure.ac | 7 +++++-- 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/ChangeLog b/ChangeLog index 28092059..00f463e5 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2009-01-07 Mark Wielaard + + * configure.ac: Warn when not building docs because tools not found. + * configure: Regenerated. + 2009-01-07 Mark Wielaard * configure.ac: Add --enable-server configure option and diff --git a/configure b/configure index 72fc7319..52b7986a 100755 --- a/configure +++ b/configure @@ -6560,12 +6560,16 @@ $as_echo "no" >&6; } fi -if test "$enable_docs" == "yes"; then - if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then +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;} { (exit 1); exit 1; }; } fi + if test "$enable_docs" == "check"; then + { $as_echo "$as_me:$LINENO: WARNING: will not build documentation, cannot find all tools" >&5 +$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}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"; then BUILD_DOCS_TRUE= diff --git a/configure.ac b/configure.ac index bf5b9d5d..95be829e 100644 --- a/configure.ac +++ b/configure.ac @@ -154,10 +154,13 @@ 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 "$enable_docs" == "yes"; then - if test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" != "xyesyesyesyes"; then +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 + if test "$enable_docs" == "check"; then + AC_MSG_WARN([will not build documentation, cannot find all tools]) + fi fi AM_CONDITIONAL([BUILD_DOCS], [test "x${have_latex}${have_dvips}${have_ps2pdf}${have_latex2html}" == "xyesyesyesyes" -a "$enable_docs" != "no"]) -- cgit