svn commit: samba-docs r424 - in trunk: .

[jelmer at samba.org]

Author: jelmer
Date: 2005-03-16 13:01:59 +0000 (Wed, 16 Mar 2005)
New Revision: 424

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba-docs&rev=424

Log:
Update list of (possible) dependencies
Allow multiple possible programs (will be used to support multiple xslt processors later on)

Modified:
   trunk/README
   trunk/aclocal.m4


Changeset:
Modified: trunk/README
===================================================================
--- trunk/README	2005-03-16 01:57:56 UTC (rev 423)
+++ trunk/README	2005-03-16 13:01:59 UTC (rev 424)
@@ -12,8 +12,6 @@
 
 Run:
 
-autoreconf
-./configure
 make all
 
 What are DocBook documents doing in the Samba Distribution ?
@@ -53,10 +51,12 @@
 
 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 @@
  * 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 

Modified: trunk/aclocal.m4
===================================================================
--- trunk/aclocal.m4	2005-03-16 01:57:56 UTC (rev 423)
+++ trunk/aclocal.m4	2005-03-16 13:01:59 UTC (rev 424)
@@ -27,7 +27,7 @@
 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"