diff options
| author | Greg <gmp@wow.st> | 2016-12-27 13:53:02 -0500 |
|---|---|---|
| committer | Greg <gmp@wow.st> | 2017-01-04 09:18:20 -0500 |
| commit | 802a6aa93fe80d10c9d5f4b95fde30239ef6e6ed (patch) | |
| tree | 273c08adb6d5cfdcedfe753bdee9e7222aeb1043 | |
| parent | e541456ee75fae1ad3f9fd9c8016d2623eb4b80c (diff) | |
Added conditional for xmllint by testing "a2x" without the -L flag.
| -rw-r--r-- | configure.ac | 17 | ||||
| -rw-r--r-- | docs/man5/Makefile.am | 8 | ||||
| -rw-r--r-- | docs/man8/Makefile.am | 8 |
3 files changed, 25 insertions, 8 deletions
diff --git a/configure.ac b/configure.ac index b4dee00..9b61312 100644 --- a/configure.ac +++ b/configure.ac @@ -240,8 +240,6 @@ AC_SUBST(LIBS) AC_SUBST(ADDITIONAL_OBJECTS) # Check for xml tools -AC_PATH_PROG(XMLLINT, xmllint, no) -AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno") AC_PATH_PROG(XSLTPROC, xsltproc, no) AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") @@ -252,6 +250,21 @@ if test x"$A2X" = x"no"; then AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.]) fi +# checking xmllint +AC_PATH_PROG(XMLLINT, xmllint, no) +if test "x$XMLLINT" != "xno"; then + AS_ECHO_N("testing xmllint... ") + echo "TEST" > conftest.txt + if $A2X -f docbook conftest.txt 2>/dev/null; then + AS_ECHO("ok") + else + AS_ECHO("failed") + XMLLINT="no" + fi + rm -f conftest.txt conftest.xml +fi +AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno") + AC_CONFIG_FILES([ Makefile src/Makefile diff --git a/docs/man5/Makefile.am b/docs/man5/Makefile.am index 8143932..f64636a 100644 --- a/docs/man5/Makefile.am +++ b/docs/man5/Makefile.am @@ -1,9 +1,11 @@ MAN5_FILES = \ tinyproxy.conf.txt -A2X_ARGS = \ - -d manpage \ - -f manpage +if HAVE_XMLLINT +A2X_ARGS = -d manpage -f manpage +else +A2X_ARGS = -d manpage -f manpage -L +endif man_MANS = \ $(MAN5_FILES:.txt=.5) diff --git a/docs/man8/Makefile.am b/docs/man8/Makefile.am index 930dcf6..ad4c010 100644 --- a/docs/man8/Makefile.am +++ b/docs/man8/Makefile.am @@ -1,9 +1,11 @@ MAN8_FILES = \ tinyproxy.txt -A2X_ARGS = \ - -d manpage \ - -f manpage +if HAVE_XMLLINT +A2X_ARGS = -d manpage -f manpage +else +A2X_ARGS = -d manpage -f manpage -L +endif man_MANS = \ $(MAN8_FILES:.txt=.8) |