Added conditional for xmllint by testing "a2x" without the -L flag.

This commit is contained in:
Greg 2016-12-27 13:53:02 -05:00
parent e541456ee7
commit 802a6aa93f
3 changed files with 25 additions and 8 deletions

View File

@ -240,8 +240,6 @@ AC_SUBST(LIBS)
AC_SUBST(ADDITIONAL_OBJECTS) AC_SUBST(ADDITIONAL_OBJECTS)
# Check for xml tools # Check for xml tools
AC_PATH_PROG(XMLLINT, xmllint, no)
AM_CONDITIONAL(HAVE_XMLLINT, test "x$XMLLINT" != "xno")
AC_PATH_PROG(XSLTPROC, xsltproc, no) AC_PATH_PROG(XSLTPROC, xsltproc, no)
AM_CONDITIONAL(HAVE_XSLTPROC, test "x$XSLTPROC" != "xno") 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.]) AC_MSG_ERROR([Test for asciidoc failed. See the file 'INSTALL' for help.])
fi 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([ AC_CONFIG_FILES([
Makefile Makefile
src/Makefile src/Makefile

View File

@ -1,9 +1,11 @@
MAN5_FILES = \ MAN5_FILES = \
tinyproxy.conf.txt tinyproxy.conf.txt
A2X_ARGS = \ if HAVE_XMLLINT
-d manpage \ A2X_ARGS = -d manpage -f manpage
-f manpage else
A2X_ARGS = -d manpage -f manpage -L
endif
man_MANS = \ man_MANS = \
$(MAN5_FILES:.txt=.5) $(MAN5_FILES:.txt=.5)

View File

@ -1,9 +1,11 @@
MAN8_FILES = \ MAN8_FILES = \
tinyproxy.txt tinyproxy.txt
A2X_ARGS = \ if HAVE_XMLLINT
-d manpage \ A2X_ARGS = -d manpage -f manpage
-f manpage else
A2X_ARGS = -d manpage -f manpage -L
endif
man_MANS = \ man_MANS = \
$(MAN8_FILES:.txt=.8) $(MAN8_FILES:.txt=.8)