diff options
| author | Kir Kolyshkin <kir@openvz.org> | 2015-07-07 05:23:45 (GMT) |
|---|---|---|
| committer | Thomas Haller <thaller@redhat.com> | 2015-07-09 20:43:18 (GMT) |
| commit | 60ac492058e0d0b9d90c3e3389b7fc56903583dc (patch) | |
| tree | bae0a4ed1327b1f3a04d30d024b42f7138dc81a0 /doc/configure.ac | |
| parent | d95915c9ceb2eb5f27abe50c222c4ccf27fa5dff (diff) | |
| download | libnl-60ac492058e0d0b9d90c3e3389b7fc56903583dc.zip libnl-60ac492058e0d0b9d90c3e3389b7fc56903583dc.tar.gz libnl-60ac492058e0d0b9d90c3e3389b7fc56903583dc.tar.bz2 | |
doc/configure.ac: simplify python check
A check for python binary that was originally introduced by commit
183e869 is needed because python is used for a couple of preprocessors
(doxygen-link.py and resolve-asciidoc-refs.py) and therefore it is
impossible to build docs without python.
While it is right to check for python, the check was both wrong and
excessive. Instead of just checking for python binary, it checked for
various versions of python and set a few variables that are not needed
here. More to say, the absense of python binary was not treated as
being fatal like it should.
Fix both problems by using AC_CHECK_PROG for python, terminating the
build in the same way as with doxygen absense. Also, remove the
m4/ax_python.m4 which is no longer needed.
Signed-off-by: Kir Kolyshkin <kir@openvz.org>
Diffstat (limited to 'doc/configure.ac')
| -rw-r--r-- | doc/configure.ac | 9 |
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/configure.ac b/doc/configure.ac index d243061..2e57570 100644 --- a/doc/configure.ac +++ b/doc/configure.ac @@ -15,8 +15,6 @@ AC_CONFIG_AUX_DIR([build-aux]) AM_INIT_AUTOMAKE([foreign]) m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES(yes)], []) -m4_include([m4/ax_python.m4]) - # # Generating the documentation # @@ -24,12 +22,15 @@ AC_ARG_ENABLE([doc], AS_HELP_STRING([--disable-doc], [Do not generate documentation]), [generate_doc="$enableval"], [generate_doc=auto]) -AX_PYTHON - if test "x$generate_doc" != "xno"; then AC_PROG_SED AC_PROG_EGREP + AC_CHECK_PROG(HAVE_PYTHON, [python], yes, no) + if test "x$HAVE_PYTHON" = "xno" -a "x$generate_doc" = "xyes"; then + AC_MSG_ERROR([*** python binary required to generate documentation]) + fi + AC_CHECK_PROG(HAVE_DOXYGEN, [doxygen], yes, no) if test "x$HAVE_DOXYGEN" = "xno" -a "x$generate_doc" = "xyes"; then AC_MSG_ERROR([*** doxygen package required to generate documentation]) |