Merge pull request #1457 from stweil/asciidoc

Don't try to build manpages if asciidoc is missing
This commit is contained in:
zdenop 2018-04-09 19:47:06 +02:00 committed by GitHub
commit 81821da730
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 25 additions and 0 deletions

View File

@ -414,6 +414,17 @@ AC_SYS_LARGEFILE
AC_CHECK_FUNCS([getline])
# ----------------------------------------
# Check for programs needed to build documentation.
# ----------------------------------------
AC_CHECK_PROG([have_asciidoc], asciidoc, true, false)
if $have_asciidoc; then
AM_CONDITIONAL([ASCIIDOC], true)
else
AM_CONDITIONAL([ASCIIDOC], false)
fi
# ----------------------------------------
# Checks for typedefs, structures, and compiler characteristics.
# ----------------------------------------
@ -513,6 +524,16 @@ echo "You can now build and install $PACKAGE_NAME by running:"
echo ""
echo "$ make"
echo "$ sudo make install"
echo ""
AM_COND_IF([ASCIIDOC],
[
echo "This will also build the documentation."
], [
echo "Documentation will not be built because asciidoc is missing."
]
)
# echo "$ sudo make install LANGS=\"eng ara deu\""
# echo " Or:"
# echo "$ sudo make install-langs"

View File

@ -1,5 +1,7 @@
# doc/Makefile.am
if ASCIIDOC
asciidoc=asciidoc -d manpage
man_MANS = \
@ -28,3 +30,5 @@ man_MANS = \
$(asciidoc) -o $@ $<
MAINTAINERCLEANFILES = $(man_MANS) Doxyfile
endif