From 1efbe18e9526d81afebc7d6136350bae4701902b Mon Sep 17 00:00:00 2001
From: Michael Hanselmann <hansmi@google.com>
Date: Thu, 19 Jun 2008 14:06:28 +0000
Subject: [PATCH] Check for docbook2{man,pdf,html}
docbook2{man,pdf,html} are mandatory. "configure" aborts if one
of them isn't found.
Reviewed-by: iustinp
---
configure.ac | 30 ++++++++++++++++++++++--------
1 file changed, 22 insertions(+), 8 deletions(-)
diff --git a/configure.ac b/configure.ac
index 8c3f86c0c..3f44121de 100644
--- a/configure.ac
+++ b/configure.ac
@@ -93,6 +93,28 @@ AC_SUBST(FILE_STORAGE_DIR, $file_storage_dir)
AC_PROG_INSTALL
AC_PROG_LN_S
+# Check for docbook programs
+AC_ARG_VAR(DOCBOOK2MAN, [docbook2man path])
+AC_PATH_PROG(DOCBOOK2MAN, [docbook2man], [])
+if test -z "$DOCBOOK2MAN"
+then
+ AC_MSG_ERROR([docbook2man not found])
+fi
+
+AC_ARG_VAR(DOCBOOK2PDF, [docbook2pdf path])
+AC_PATH_PROG(DOCBOOK2PDF, [docbook2pdf], [])
+if test -z "$DOCBOOK2PDF"
+then
+ AC_MSG_ERROR([docbook2pdf not found])
+fi
+
+AC_ARG_VAR(DOCBOOK2HTML, [docbook2html path])
+AC_PATH_PROG(DOCBOOK2HTML, [docbook2html], [])
+if test -z "$DOCBOOK2HTML"
+then
+ AC_MSG_ERROR([docbook2html not found])
+fi
+
# Check for Python
AM_PATH_PYTHON(2.4)
@@ -103,14 +125,6 @@ AC_PYTHON_MODULE(OpenSSL, t)
AC_PYTHON_MODULE(simplejson, t)
AC_PYTHON_MODULE(pyparsing, t)
-# Check for docbook2man
-found_docbook2man=
-AC_CHECK_PROG(found_docbook2man, [docbook2man], [yes])
-if test "$found_docbook2man" != "yes"
-then
- AC_MSG_WARN([docbook2man not found.])
-fi
-
AC_CONFIG_FILES([ Makefile ])
AC_OUTPUT
--
GitLab