[3067] Detect if elinks exists before trying to use it to generate docs

diff --git a/configure.ac b/configure.ac
index 72a825edd8f08d721e81295f9c45cab0d3ae7597..e0d0fd8bcbd5c9e01837bb75ad254feee8e7e418 100644 (file)
--- 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 1d63c04b31df2f5c308a9e971585accb51df1a10..8f3aaaf23bd393f032046d865b32bc07c24995ec 100644 (file)
--- 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 \