Added conditional for xmllint by testing "a2x" without the -L flag.
This commit is contained in:
parent
e541456ee7
commit
802a6aa93f
17
configure.ac
17
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
|
||||
|
@ -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)
|
||||
|
@ -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)
|
||||
|
Loading…
Reference in New Issue
Block a user