Commit ec3e03eb authored by Francis Dupont's avatar Francis Dupont

[117-configure-script-doesn-t-fail-when-enable-generate-docs-is-used-and-docbo...

[117-configure-script-doesn-t-fail-when-enable-generate-docs-is-used-and-docbook-style-xsl-is-not-installed] Made --nonet in xsltproc optional
parent ea0c9765
......@@ -1397,6 +1397,14 @@ AC_ARG_ENABLE(generate_docs, [AC_HELP_STRING([--enable-generate-docs],
if test "x$enable_generate_docs" != xno ; then
# xsltproc --nonet parameter
NONET="--nonet"
AC_ARG_VAR(XSLTPROC_NET, [xsltproc uses the Internet to fetch DTDs, entities or documents.])
if test "x$XSLTPROC_NET" != x ; then
NONET=
fi
AC_SUBST(NONET)
# Check for xsltproc
AC_PATH_PROG([XSLTPROC], [xsltproc])
if test -z "$XSLTPROC"; then
......@@ -1404,11 +1412,11 @@ if test "x$enable_generate_docs" != xno ; then
else
AC_MSG_CHECKING([if $XSLTPROC works])
# run xsltproc to see if works
$XSLTPROC --novalid --xinclude http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
$XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl
if test $? -ne 0 ; then
AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/manpages/docbook.xsl")
fi
$XSLTPROC --novalid --xinclude http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
$XSLTPROC --novalid --xinclude $NONET http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl
if test $? -ne 0 ; then
AC_MSG_ERROR("Error with $XSLTPROC using release/xsl/current/html/docbook.xsl")
fi
......
......@@ -24,7 +24,7 @@ kea-messages.xml:
if GENERATE_DOCS
kea-guide.html: $(DOCBOOK)
@XSLTPROC@ --novalid --xinclude --nonet \
@XSLTPROC@ --novalid --xinclude @NONET@ \
--path $(top_builddir)/doc \
-o $@ \
--stringparam section.autolabel 1 \
......@@ -37,7 +37,7 @@ kea-guide.txt: kea-guide.html
@ELINKS@ -dump -no-numbering -no-references kea-guide.html > $@
kea-messages.html: kea-messages.xml
@XSLTPROC@ --novalid --xinclude --nonet \
@XSLTPROC@ --novalid --xinclude @NONET@ \
--path $(top_builddir)/doc \
-o $@ \
--stringparam generate.toc "book toc" \
......
......@@ -10,7 +10,7 @@ EXTRA_DIST = $(man_MANS) kea-admin.xml admin-utils.sh
if GENERATE_DOCS
kea-admin.8: kea-admin.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml
else
......
......@@ -18,7 +18,7 @@ EXTRA_DIST += agent.dox agent_hooks.dox
if GENERATE_DOCS
kea-ctrl-agent.8: kea-ctrl-agent.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-ctrl-agent.xml
......
......@@ -27,7 +27,7 @@ EXTRA_DIST += images/trans_classes.svg images/update_exec_classes.svg
if GENERATE_DOCS
kea-dhcp-ddns.8: kea-dhcp-ddns.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-dhcp-ddns.xml
......
......@@ -30,7 +30,7 @@ EXTRA_DIST += dhcp4_parser.yy
if GENERATE_DOCS
kea-dhcp4.8: kea-dhcp4.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-dhcp4.xml
......
......@@ -31,7 +31,7 @@ EXTRA_DIST += dhcp6_parser.yy
if GENERATE_DOCS
kea-dhcp6.8: kea-dhcp6.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-dhcp6.xml
......
......@@ -24,7 +24,7 @@ BUILT_SOURCES = $(KEA_CONFIGFILES)
if GENERATE_DOCS
keactrl.8: keactrl.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml
else
......
......@@ -17,7 +17,7 @@ EXTRA_DIST = $(man_MANS) kea-lfc.xml lfc.dox
if GENERATE_DOCS
kea-lfc.8: kea-lfc.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-lfc.xml
......
......@@ -20,7 +20,7 @@ EXTRA_DIST = $(man_MANS) kea-netconf.xml
if GENERATE_DOCS
kea-netconf.8: kea-netconf.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-netconf.xml
......
......@@ -59,7 +59,7 @@ EXTRA_DIST += $(man_MANS) perfdhcp.xml
if GENERATE_DOCS
perfdhcp.8: perfdhcp.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/perfdhcp.xml
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/perfdhcp.xml
else
......
......@@ -12,7 +12,7 @@ EXTRA_DIST = $(man_MANS) kea-shell.xml
if GENERATE_DOCS
kea-shell.8: kea-shell.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ \
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ \
http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
$(srcdir)/kea-shell.xml
......
......@@ -19,7 +19,7 @@ EXTRA_DIST = $(man_MANS) kea-sockcreator.xml
if GENERATE_DOCS
kea-sockcreator.8: kea-sockcreator.xml
@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml
@XSLTPROC@ --novalid --xinclude @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml
else
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment