diff options
| author | Bdale Garbee <bdale@gag.com> | 2019-01-02 23:03:41 -0700 |
|---|---|---|
| committer | Bdale Garbee <bdale@gag.com> | 2019-01-02 23:03:41 -0700 |
| commit | 5b4da841459a650e641924aab132f566c6259c4d (patch) | |
| tree | f100df4df030fc811046124b7a7c68197ffe128f | |
| parent | 95ffec073b0758801df04a77eca0bd2bc6e57e35 (diff) | |
| parent | ecf40a3a190fb2f7d7d2654c1e87daddf0362b0c (diff) | |
Merge branch 'master' into branch-1.91.9
| -rw-r--r-- | configure.ac | 6 | ||||
| -rw-r--r-- | doc/Makefile.am | 2 |
2 files changed, 8 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index ee175dbe..abaec2cd 100644 --- a/configure.ac +++ b/configure.ac @@ -386,6 +386,12 @@ if test "x$HAVE_NICKLE" = "xno"; then AC_MSG_ERROR([Please install nickle to build AltOs]) fi +AC_CHECK_PROG([HAVE_ASCIIDOCTOR_PDF], [asciidoctor-pdf], yes, no) +if test "x$HAVE_ASCIIDOCTOR_PDF" = "xno"; then + AC_MSG_WARN([asciidoctor-pdf not found, PDF docs will not be built]) +fi +AM_CONDITIONAL([ASCIIDOCTOR_PDF], [test x$HAVE_ASCIIDOCTOR_PDF != xno]) + PKG_CHECK_MODULES([JANSSON], [jansson]) AC_ARG_WITH([readline], diff --git a/doc/Makefile.am b/doc/Makefile.am index 67033e8b..4dfb3094 100644 --- a/doc/Makefile.am +++ b/doc/Makefile.am @@ -225,8 +225,10 @@ PUBLISH_HTML=altusmetrum.html micropeak.html telegps.html easymini.html $(ONEFIL HTML=$(PUBLISH_HTML) $(RELNOTES_HTML) +if ASCIIDOCTOR_PDF PDF=altusmetrum.pdf micropeak.pdf telegps.pdf easymini.pdf $(ONEFILE_PDF_FILES) \ $(OUTLINE_PDF_FILES) +endif MAP_DOT_FILES=map-loading.dot MAP_SVG_FILES=$(MAP_DOT_FILES:.dot=.svg) |