Removed "--nonet" from all xsltproc commands.

--nonet prevented XSL files from being downloaded and thus prevented
make commands from terminating succesfully. Supposedly, on some
machines --nonet works and is faster.

diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 561c1428939242345d3b85309663d6fb63a9602e..db750fe52ecdac00ad462073bbb74ad40009c073 100644 (file)
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -22,7 +22,7 @@ kea-messages.xml:
 if GENERATE_DOCS
 
 kea-guide.html: $(DOCBOOK)
-       @XSLTPROC@ --novalid --xinclude --nonet \
+       @XSLTPROC@ --novalid --xinclude \
                --path $(top_builddir)/doc \
                -o $@ \
                --stringparam section.autolabel 1 \
@@ -35,7 +35,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 \
                --path $(top_builddir)/doc \
                -o $@ \
                --stringparam generate.toc "book toc" \

diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am
index a71ee1c7376bf812641684c51c50d3edbb99e6b0..775e4cee2f03e0f89f8608d2e5933468d59ea2c4 100644 (file)
--- a/src/bin/admin/Makefile.am
+++ b/src/bin/admin/Makefile.am
@@ -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 -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml
 
 else
 

diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 895865e4daa0da6673396883b1a026c635c3c3a4..bc6627ce201c2eba3b8b0d7a44ef96836578910e 100644 (file)
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -35,7 +35,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 -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
        $(srcdir)/kea-dhcp-ddns.xml
 

diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index 8360677861bf8a3e87a420956c210c58d342d481..4a6ec7ccc1efefb84ae9e8607f43035f09ff80a4 100644 (file)
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -29,7 +29,7 @@ EXTRA_DIST += dhcp4.dox dhcp4_hooks.dox dhcp4o6.dox
 
 if GENERATE_DOCS
 kea-dhcp4.8: kea-dhcp4.xml
-       @XSLTPROC@ --novalid --xinclude --nonet -o $@ \
+       @XSLTPROC@ --novalid --xinclude -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
        $(srcdir)/kea-dhcp4.xml
 

diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index 7653582e65e52ca02b0db13b696bcd3e50c844b3..b307b246a7f050b50355ebee2772c9beac1cb908 100644 (file)
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -30,7 +30,7 @@ EXTRA_DIST += dhcp6.dox dhcp6_hooks.dox dhcp4o6.dox
 if GENERATE_DOCS
 
 kea-dhcp6.8: kea-dhcp6.xml
-       @XSLTPROC@ --novalid --xinclude --nonet -o $@ \
+       @XSLTPROC@ --novalid --xinclude -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
         $(srcdir)/kea-dhcp6.xml
 

diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index c83a59745700531d90bda0f88eb491483c04a45d..223a6e19396cb545bcf525f730dd87af4825cc57 100644 (file)
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -19,7 +19,7 @@ BUILT_SOURCES = kea.conf
 if GENERATE_DOCS
 
 keactrl.8: keactrl.xml
-       @XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml
+       @XSLTPROC@ --novalid --xinclude -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/keactrl.xml
 
 else
 

diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index 7bfeb96df79e136afbd3051fcc6648ae575338fd..91dee0672b311084d70b091d9f04d3fb078b3b1b 100644 (file)
--- a/src/bin/lfc/Makefile.am
+++ b/src/bin/lfc/Makefile.am
@@ -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 -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
        $(srcdir)/kea-lfc.xml
 

diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am
index 74d2975babb663f00bc09ebdae8414aa645f1927..68240939249991973ed31244c687814194876385 100644 (file)
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@ -53,7 +53,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 -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/perfdhcp.xml
 
 else
 

diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index 9fb4c96b3b2fb8a00c3b04876aa915c224848940..c96fd2498bca1256f9656211cebf3cd3386a8a9c 100644 (file)
--- a/src/bin/sockcreator/Makefile.am
+++ b/src/bin/sockcreator/Makefile.am
@@ -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 -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml
 
 else