BIND 10 trac1687, updated. 5b9ec6389bc87be6214a3e40cdfc3375e467f0ce [trac1687]

[BIND 10 source code commits]

The branch, trac1687 has been updated
       via  5b9ec6389bc87be6214a3e40cdfc3375e467f0ce (commit)
       via  0fec09f309665278bbc9e8ac291203290fe85e8f (commit)
      from  41040dc27da86909c61187b8951f63f9d71c3dc7 (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 5b9ec6389bc87be6214a3e40cdfc3375e467f0ce
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Fri Jun 1 12:39:31 2012 -0700

    [trac1687]
    
    remove built man page on make clean.
    (maybe this should be for maintainer clean only?)
    
    Use $XSLTPROC macro instead of xsltproc.
    
    Generate dummy manpage if --enable-man is not defined.
    This idea came from pango source tree.
    This is workaround so that the dist tarball includes the manpage.
    (Some is commented out; this is not complete yet.)
    
    This is because "make dist" needs the manpages but I don't want normal
    "make" builds to require building them due to more build dependencies.

commit 0fec09f309665278bbc9e8ac291203290fe85e8f
Author: Jeremy C. Reed <jreed at isc.org>
Date:   Fri Jun 1 12:38:13 2012 -0700

    [trac1687] check and test xsltproc
    
    when using --enable-man check and test for xsltproc
    and the needed docbook stylesheets

-----------------------------------------------------------------------

Summary of changes:
 configure.ac               |   23 ++++++++++++++++++++++-
 src/bin/bind10/Makefile.am |   16 +++++++++++++++-
 2 files changed, 37 insertions(+), 2 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index 6935431..d3210cd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -967,7 +967,28 @@ AC_PATH_PROGS(AWK, gawk awk)
 AC_SUBST(AWK)
 
 AC_ARG_ENABLE(man, [AC_HELP_STRING([--enable-man],
-  [regenerate man pages [default=no]])], enable_man=$enableval, enable_man=no)
+  [regenerate man pages using Docbook [default=no]])],
+  enable_man=$enableval, enable_man=no)
+
+# Check for xsltproc
+if test "x$enable_man" != xno ; then
+  AC_PATH_PROG([XSLTPROC], [xsltproc])
+  if test -z "$XSLTPROC"; then
+    AC_MSG_ERROR("xsltproc not found; it is required for --enable-man")
+  else
+    AC_MSG_CHECKING([if $XSLTPROC works])
+    # run xsltproc to see if works
+    $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 --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
+  fi
+fi
+
 
 AM_CONDITIONAL(ENABLE_MAN, test x$enable_man != xno)
 
diff --git a/src/bin/bind10/Makefile.am b/src/bin/bind10/Makefile.am
index 69ea256..68940c9 100644
--- a/src/bin/bind10/Makefile.am
+++ b/src/bin/bind10/Makefile.am
@@ -17,12 +17,26 @@ bind10_DATA = bob.spec
 EXTRA_DIST = bob.spec
 
 man_MANS = bind10.8
+CLEANFILES += $(man_MANS)
 EXTRA_DIST += $(man_MANS) bind10.xml bind10_messages.mes
 
 if ENABLE_MAN
 
 bind10.8: bind10.xml
-	xsltproc --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml 
+	@XSLTPROC@ --novalid --xinclude --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/manpages/docbook.xsl $(srcdir)/bind10.xml 
+
+#dist-local-check-mans-enabled:
+#	@if grep "Man generation disabled" $(man_MANS) >/dev/null; then $(RM) $(man_MANS); fi
+
+else
+
+$(man_MANS):
+	@echo Man generation disabled.  Creating dummy $@.  Configure with --enable-man to enable it.
+	@echo Man generation disabled.  Remove this file, configure with --enable-man, and rebuild BIND 10 > $@
+
+#dist-local-check-mans-enabled:
+#	@echo "*** --enable-man must be used in order to make dist"
+#	@false
 
 endif