build-sys: only pass --failure-level if supported

Signed-off-by: Thomas Weißschuh <thomas@t-8ch.de>

diff --git a/Makefile.am b/Makefile.am
index 3da0e8715c501438a77153569683c1ef90884b21..effbb02fc2b79d7981d2511786ad29612ea15d2b 100644 (file)
--- a/Makefile.am
+++ b/Makefile.am
@@ -230,10 +230,13 @@ asciidoc_man_cmd = $(ASCIIDOCTOR) \
        -a 'package-docdir=$(docdir)' \
        -a 'VERSION=$(VERSION)' \
        -a 'ADJTIME_PATH=$(ADJTIME_PATH)' \
-       --failure-level ERROR \
        --load-path '$(abs_srcdir)/tools' \
        --require asciidoctor-includetracker
 
+if HAVE_ASCIIDOCTOR_FAILURE_LEVEL
+asciidoc_man_cmd += --failure-level ERROR
+endif
+
 SUFFIXES = .1.adoc .3.adoc .5.adoc .8.adoc .1 .3 .5 .8
 .1.adoc.1 .3.adoc.3 .5.adoc.5 .8.adoc.8:
        $(AM_V_GEN) test -f ./$@ || \

diff --git a/configure.ac b/configure.ac
index a381f79363ca6f4e4800f2d7bcfd51e6847fabae..c80ef7bded10973ba7f5018e049ad3695cf8fcee 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -805,6 +805,16 @@ AC_ARG_ENABLE([asciidoc],
 UL_BUILD_INIT([asciidoc])
 UL_REQUIRES_PROGRAM([asciidoc], [ASCIIDOCTOR], [asciidoctor], [man pages])
 AM_CONDITIONAL([ENABLE_ASCIIDOC], [test "x$build_asciidoc" = xyes])
+AS_IF([test "x$build_asciidoc" = xyes], [
+       AC_MSG_CHECKING([whether ${ASCIIDOCTOR} supports --failure-level])
+       AS_IF([${ASCIIDOCTOR} --help | grep failure-level >/dev/null 2>&1 ], [
+         AC_MSG_RESULT([yes])
+         AM_CONDITIONAL([HAVE_ASCIIDOCTOR_FAILURE_LEVEL], [true])
+       ], [
+         AC_MSG_RESULT([no])
+         AM_CONDITIONAL([HAVE_ASCIIDOCTOR_FAILURE_LEVEL], [false])
+       ])
+])
 
 have_manpages=no
 AS_IF([test -f "$srcdir/sys-utils/mount.8"], [

diff --git a/po-man/Makefile.am b/po-man/Makefile.am
index 9fa5406aa630ac08b3e6e77678cba4581d84f23c..399f8faeb59a23b87bb041f2028312351e117e13 100644 (file)
--- a/po-man/Makefile.am
+++ b/po-man/Makefile.am
@@ -35,10 +35,13 @@ asciidoc_man_cmd = $(ASCIIDOCTOR) \
        -a 'package-docdir=$(docdir)' \
        -a 'VERSION=$(VERSION)' \
        -a 'ADJTIME_PATH=$(ADJTIME_PATH)' \
-       --failure-level ERROR \
        --load-path '$(top_srcdir)/tools' \
        --require asciidoctor-unicodeconverter
 
+if HAVE_ASCIIDOCTOR_FAILURE_LEVEL
+asciidoc_man_cmd += --failure-level ERROR
+endif
+
 gen-mans: gen-trans
        @set -e; \
          for l in $(PO_LANGS); do \