From: Francis Dupont <fdupont@isc.org>
Date: Thu, 17 Jan 2019 08:18:31 +0000 (+0100)
Subject: [117-configure-script-doesn-t-fail-when-enable-generate-docs-is-used-and-docbook... 
X-Git-Tag: 441-make-distcheck-fails-on-fedora-29_base~6
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=ec3e03eb06d47a37cb1eaab0ba7f738ce60a45a1;p=thirdparty%2Fkea.git

[117-configure-script-doesn-t-fail-when-enable-generate-docs-is-used-and-docbook-style-xsl-is-not-installed] Made --nonet in xsltproc optional
---

diff --git a/configure.ac b/configure.ac
index ee429e73b2..126d9c6d08 100644
--- a/configure.ac
+++ b/configure.ac
@@ -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
diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index ead79dc0a9..24cf170e2f 100644
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -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" \
diff --git a/src/bin/admin/Makefile.am b/src/bin/admin/Makefile.am
index 1de129ada3..e96ec9e7b3 100644
--- 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 @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-admin.xml
 
 else
 
diff --git a/src/bin/agent/Makefile.am b/src/bin/agent/Makefile.am
index dfb52a2304..ffea77b4df 100644
--- a/src/bin/agent/Makefile.am
+++ b/src/bin/agent/Makefile.am
@@ -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
 
diff --git a/src/bin/d2/Makefile.am b/src/bin/d2/Makefile.am
index 7da230336a..7f52bafb40 100644
--- a/src/bin/d2/Makefile.am
+++ b/src/bin/d2/Makefile.am
@@ -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
 
diff --git a/src/bin/dhcp4/Makefile.am b/src/bin/dhcp4/Makefile.am
index a0da1621b8..56defd6e6c 100644
--- a/src/bin/dhcp4/Makefile.am
+++ b/src/bin/dhcp4/Makefile.am
@@ -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
 
diff --git a/src/bin/dhcp6/Makefile.am b/src/bin/dhcp6/Makefile.am
index e82f9c2770..6d26c557c1 100644
--- a/src/bin/dhcp6/Makefile.am
+++ b/src/bin/dhcp6/Makefile.am
@@ -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
 
diff --git a/src/bin/keactrl/Makefile.am b/src/bin/keactrl/Makefile.am
index 425a5b6c3b..9851f58f5e 100644
--- a/src/bin/keactrl/Makefile.am
+++ b/src/bin/keactrl/Makefile.am
@@ -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
diff --git a/src/bin/lfc/Makefile.am b/src/bin/lfc/Makefile.am
index bebe6bfb8e..fa29381a28 100644
--- 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 @NONET@ -o $@ \
         http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl \
 	$(srcdir)/kea-lfc.xml
 
diff --git a/src/bin/netconf/Makefile.am b/src/bin/netconf/Makefile.am
index a2ed58c31a..50040b69b9 100644
--- a/src/bin/netconf/Makefile.am
+++ b/src/bin/netconf/Makefile.am
@@ -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
 
diff --git a/src/bin/perfdhcp/Makefile.am b/src/bin/perfdhcp/Makefile.am
index b6b927993e..c1e4531912 100644
--- a/src/bin/perfdhcp/Makefile.am
+++ b/src/bin/perfdhcp/Makefile.am
@@ -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
 
diff --git a/src/bin/shell/Makefile.am b/src/bin/shell/Makefile.am
index 29bae0f71e..021d8d2be3 100644
--- a/src/bin/shell/Makefile.am
+++ b/src/bin/shell/Makefile.am
@@ -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
 
diff --git a/src/bin/sockcreator/Makefile.am b/src/bin/sockcreator/Makefile.am
index 9fb4c96b3b..f5b1f7f492 100644
--- 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 @NONET@ -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/kea-sockcreator.xml
 
 else