summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2005-03-16 13:01:59 +0000
committerGerald W. Carter <jerry@samba.org>2008-04-23 08:46:22 -0500
commit8c41033595f57136f47dc6b268b92e83077414d4 (patch)
tree186277767f5849fb02194157e017e1cb83c12bc2
parentb03c4786281c830ce92f248eef96053269dd029e (diff)
downloadsamba-8c41033595f57136f47dc6b268b92e83077414d4.tar.gz
samba-8c41033595f57136f47dc6b268b92e83077414d4.tar.bz2
samba-8c41033595f57136f47dc6b268b92e83077414d4.zip
Update list of (possible) dependencies
Allow multiple possible programs (will be used to support multiple xslt processors later on) (This used to be commit 6f80dcdf3a7752283265cebc87073121120bb6da)
-rw-r--r--docs/README20
-rw-r--r--docs/aclocal.m42
2 files changed, 18 insertions, 4 deletions
diff --git a/docs/README b/docs/README
index 0f6c0e78db..9f3e14845b 100644
--- a/docs/README
+++ b/docs/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/docs/aclocal.m4 b/docs/aclocal.m4
index a1d85ef5c4..9ecbda5e6b 100644
--- a/docs/aclocal.m4
+++ b/docs/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"