BIND 10 master, updated. 1745301647282b8db81d5618543aabe66b255dd8 Merge branch 'trac3067'

[BIND 10 source code commits]

The branch, master has been updated
       via  1745301647282b8db81d5618543aabe66b255dd8 (commit)
       via  cbdbafbef1e3eaebcf057e15afdef9e6b387e058 (commit)
      from  35a7432feeb263c42eae96d6388729476f20b6f2 (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 1745301647282b8db81d5618543aabe66b255dd8
Merge: 35a7432 cbdbafb
Author: Mukund Sivaraman <muks at isc.org>
Date:   Tue Aug 13 17:36:45 2013 +0530

    Merge branch 'trac3067'

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

Summary of changes:
 configure.ac          |    5 +++++
 doc/guide/Makefile.am |    4 +---
 2 files changed, 6 insertions(+), 3 deletions(-)

-----------------------------------------------------------------------
diff --git a/configure.ac b/configure.ac
index b9b1fa1..e5ec669 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1132,6 +1132,11 @@ if test "x$enable_generate_docs" != xno ; then
     fi
     AC_MSG_RESULT(yes)
   fi
+
+  AC_PATH_PROG([ELINKS], [elinks])
+  if test -z "$ELINKS"; then
+    AC_MSG_ERROR("elinks not found; it is required for --enable-generate-docs")
+  fi
 fi
 
 
diff --git a/doc/guide/Makefile.am b/doc/guide/Makefile.am
index 1d63c04..8f3aaaf 100644
--- a/doc/guide/Makefile.am
+++ b/doc/guide/Makefile.am
@@ -21,10 +21,8 @@ bind10-guide.html: bind10-guide.xml
 		http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl \
 		$(srcdir)/bind10-guide.xml
 
-HTML2TXT = elinks -dump -no-numbering -no-references
-
 bind10-guide.txt: bind10-guide.html
-	$(HTML2TXT) bind10-guide.html > $@
+	@ELINKS@ -dump -no-numbering -no-references bind10-guide.html > $@
 
 bind10-messages.html: bind10-messages.xml
 	@XSLTPROC@ --novalid --xinclude --nonet \