Update list of (possible) dependencies

Allow multiple possible programs (will be used to support multiple xslt processors later on)

diff --git a/README b/README
index 0f6c0e78db224e363226ffb2bb4239bdd6d33ec5..9f3e14845b0bea4826c3e2870dbbf0e7b3b75b49 100644 (file)
--- a/README
+++ b/README
@@ -12,8 +12,6 @@ Quick start
 
 Run:
 
-autoreconf
-./configure
 make all
 
 What are DocBook documents doing in the Samba Distribution ?
@@ -53,10 +51,12 @@ The Tools
 
 To generate the docs, you need to have the following packages installed:
 
- * autoconf
+ * GNU Make
+ * GNU autoconf
  * docbook-utils
  * xsltproc
  * pngtopnm and pnmtops (from the netpbm utilities)
+ * dia
 
 For generating PDF (thru LaTeX):
  * db2latex (from http://db2latex.sf.net/). Make sure to get CVS version
@@ -65,13 +65,27 @@ For generating PDF (thru LaTeX):
  * pdflatex
  * thumbpdf
 
+For generating PDF (thru FO):
+ * fop (http://xml.apache.org/fop/)
+
 For generating PostScript (thru LaTeX):
+ * db2latex
  * latex
  * dvips 
 
 For generating ASCII:
  * html2text
 
+For generating Palm-viewable docs:
+ * plucker-build
+
+For generating texi files:
+ * docbook2x-texi
+ * makeinfo
+
+For validating:
+ * xmllint
+
 This directory now contains a ./configure script and Makefile to 
 support the automated building of man pages (including HTML versions), and 
 the building of the Samba-HOWTO-Collection and the 

diff --git a/aclocal.m4 b/aclocal.m4
index a1d85ef5c411a9ecb31beef34b985eb432650e80..9ecbda5e6bc096818e3e0ca85fd950aece75257b 100644 (file)
--- a/aclocal.m4
+++ b/aclocal.m4
@@ -27,7 +27,7 @@ dnl arg2: program executable name
 dnl arg3: target that requires it
 
 AC_DEFUN(DOCS_TARGET_REQUIRE_PROGRAM, [
-       AC_PATH_PROG([$1], [$2])
+       AC_CHECK_PROGS([$1], [$2])
        if test x"$$1" = x; then
                if test x"$$3_REQUIRES" = x; then
                        $3_REQUIRES="$2"