jimzah/openafs
1
0
Fork 0
mirror of https://git.openafs.org/openafs.git synced 2025-01-18 23:10:58 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

doc: let configure find the XML tools if possible

Browse Source 
configure should attempt to find the XML tools we need to process
the documentation.  if it can't, it should provide a safe default.
still allow the user to override via command line.

Reviewed-on: http://gerrit.openafs.org/4766
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Simon Wilkinson <sxw@inf.ed.ac.uk>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
(cherry picked from commit cc2bc3e17f)

Change-Id: I4773affa193b5210da6416dd8b4321bd3f471429
Reviewed-on: http://gerrit.openafs.org/4794
Tested-by: BuildBot <buildbot@rampaginggeek.com>
Reviewed-by: Derrick Brashear <shadow@dementia.org>
This commit is contained in:
Chas Williams (CONTRACTOR) 2011-06-02 19:00:47 -04:00 committed by Derrick Brashear
parent 3aad0fa57e
commit f9930accfd
4 changed files with 14 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
acinclude.m4
View File

@ -231,12 +231,11 @@ AC_ARG_ENABLE([linux-syscall-probing],
,
[enable_linux_syscall_probing="maybe"])
AC_ARG_WITH([xslt-processor],
AS_HELP_STRING([--with-xslt-processor=ARG],
[which XSLT processor to use (possible choices are: libxslt, saxon, xalan-j, xsltproc)]),
XSLTPROC="$withval",
XSLTPROC="libxslt")
AC_CHECK_PROGS([XSLTPROC], [libxslt saxon xalan-j xsltproc], [echo]))
AC_ARG_WITH([html-xsl],
AS_HELP_STRING([--with-html-xsl],
@ -244,6 +243,12 @@ AC_ARG_WITH([html-xsl],
HTML_XSL="$withval",
HTML_XSL=no)
AC_ARG_WITH([docbook2pdf],
AS_HELP_STRING([--with-docbook2pdf=ARG],
[which Docbook to PDF utility to use (possible choices are: docbook2pdf, dblatex)]),
DOCBOOK2PDF="$withval",
AC_CHECK_PROGS([DOCBOOK2PDF], [docbook2pdf dblatex], [echo]))
enable_login="no"
dnl weird ass systems
@ -1428,6 +1433,7 @@ AC_SUBST(DARWIN_INFOFILE)
AC_SUBST(IRIX_BUILD_IP35)
AC_SUBST(HTML_XSL)
AC_SUBST(XSLTPROC)
AC_SUBST(DOCBOOK2PDF)
OPENAFS_OSCONF
OPENAFS_FUSE

3
doc/xml/AdminGuide/Makefile.in
View File

@ -27,13 +27,14 @@ SRCS = $(BOOK) auagd005.xml auagd006.xml auagd007.xml auagd008.xml \
auagd024.xml auagd025.xml
HTML_XSL = @HTML_XSL@
XSLTPROC = @XSLTPROC@
DOCBOOK2PDF = @DOCBOOK2PDF@
html: $(SRCS) $(VERSFILE).xml
$(XSLTPROC) --param navig.graphics 1 \
--stringparam navig.graphics.path ../ $(HTML_XSL) $(BOOK)
pdf: $(SRCS) $(VERSFILE).xml
dblatex $(BOOK)
$(DOCBOOK2PDF) $(BOOK)
check:
xmllint --noout --valid $(BOOK)

3
doc/xml/QuickStartUnix/Makefile.in
View File

@ -24,13 +24,14 @@ SRCS = $(BOOK) auqbg003.xml auqbg004.xml auqbg005.xml auqbg006.xml \
auqbg007.xml auqbg008.xml appendix.xml appendix_dafs.xml
HTML_XSL = @HTML_XSL@
XSLTPROC = @XSLTPROC@
DOCBOOK2PDF = @DOCBOOK2PDF@
html: $(SRCS) $(VERSFILE).xml
$(XSLTPROC) --param navig.graphics 1 \
--stringparam navig.graphics.path ../ $(HTML_XSL) $(BOOK)
pdf: $(SRCS) $(VERSFILE).xml
dblatex $(BOOK)
$(DOCBOOK2PDF) $(BOOK)
check:
xmllint --noout --valid $(BOOK)

3
doc/xml/UserGuide/Makefile.in
View File

@ -25,13 +25,14 @@ SRCS = $(BOOK) auusg003.xml auusg004.xml auusg005.xml auusg006.xml \
auusg012.xml
HTML_XSL = @HTML_XSL@
XSLTPROC = @XSLTPROC@
DOCBOOK2PDF = @DOCBOOK2PDF@
html: $(SRCS) $(VERSFILE).xml
$(XSLTPROC) --param navig.graphics 1 \
--stringparam navig.graphics.path ../ $(HTML_XSL) $(BOOK)
pdf: $(SRCS) $(VERSFILE).xml
dblatex $(BOOK)
$(DOCBOOK2PDF) $(BOOK)
check:
xmllint --noout --valid $(BOOK)