On 10/24/2010 01:39 AM, Justin Clift wrote:
The default location for the XML catalog file, /etc/xml/catalog,
used when validating the generated html docs, isn't correct for
MacOS X.
This commit adds an option to the configure script, allowing the
default to be overridden:
--with-xml-catalog-file=/path/to/xml/catalog/file
---
Tested on MacOS X 10.6 (using overridden locatin), and Fedora 13 (using the
default location). Works fine on both.
ACK with two nits:
+dnl Specific XML catalog file for validation of generated html
+AC_ARG_WITH([xml-catalog-file], [AC_HELP_STRING([--with-xml-catalog-file=path],
+ [path to XML catalog file for validating generated html, default /etc/xml/catalog])],
this line is long; you can put arbitrary line breaks in the second
argument to AC_HELP_STRING, and autoconf will automatically re-fill the
line to 80 columns in the ./configure --help output. So, to avoid a
long line, just do:
AC_ARG_WITH([xml-catalog-file],
[AC_HELP_STRING([--with-xml-catalog-file=path],
[path to XML catalog file for validating generated
html, default /etc/xml/catalog])],
[XML_CATALOG_FILE=$withval],
[XML_CATALOG_FILE='/etc/xml/catalog'])
%.html: %.html.tmp
@if test -x $(XMLLINT)&& test -x $(XMLCATALOG) ; then \
- if $(XMLCATALOG) /etc/xml/catalog \
+ if $(XMLCATALOG) $(XML_CATALOG_FILE) \
Should we worry about potential whitespace in $(XML_CATALOG_FILE)? That
is, except for single quote, we can make this more robust by using:
if $(XMLCATALOG) '$(XML_CATALOG_FILE)'
and so forth for all Makefile references to this variable.
--
Eric Blake eblake@xxxxxxxxxx +1-801-349-2682
Libvirt virtualization library http://libvirt.org
--
libvir-list mailing list
libvir-list@xxxxxxxxxx
https://www.redhat.com/mailman/listinfo/libvir-list