Handle HTML generation in the absence of XHTML1 DTDs

* configure.in libvirt.spec.in docs/Makefile.am: fix the problem
  of HTML generation in the absence of XHTML1 DTDs in the system
  catalog.
Daniel

diff --git a/ChangeLog b/ChangeLog
index db3b45c7f1b2ece2ccf2dcdf317718d8a777e2d5..c849bc1b6d34a99bc8831cba7f436992bb455e8c 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+Wed Aug 20 15:11:57 CEST 2008 Daniel Veillard <veillard@redhat.com>
+
+       * configure.in libvirt.spec.in docs/Makefile.am: fix the problem
+         of HTML generation in the absence of XHTML1 DTDs in the system
+         catalog.
+
 Wed Aug 20 14:49:29 CEST 2008 Daniel Veillard <veillard@redhat.com>
 
        * src/network_conf.c src/network_conf.h src/qemu_driver.c: allow to

diff --git a/configure.in b/configure.in
index 0513a72afa36ebe58a56ef0855d1f0c5cb72ce6d..ac4321fa407cd9a848905e104d4cef1bde8fd492 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -97,6 +97,7 @@ AC_PATH_PROG([RM], [rm], [/bin/rm])
 AC_PATH_PROG([MV], [mv], [/bin/mv])
 AC_PATH_PROG([TAR], [tar], [/bin/tar])
 AC_PATH_PROG([XMLLINT], [xmllint], [/usr/bin/xmllint])
+AC_PATH_PROG([XMLCATALOG], [xmlcatalog], [/usr/bin/xmlcatalog])
 AC_PATH_PROG([XSLTPROC], [xsltproc], [/usr/bin/xsltproc])
 
 AC_PROG_MKDIR_P

diff --git a/docs/Makefile.am b/docs/Makefile.am
index 025f20adcacb9cb7bb54cc630427d3c3cb7255e2..54852d8fe99538fc4c99c99cf33e504a1bf7e913 100644 (file)
--- a/docs/Makefile.am
+++ b/docs/Makefile.am
@@ -94,18 +94,22 @@ ChangeLog.html.in: ChangeLog.xml ChangeLog.xsl
          $(XSLTPROC) --stringparam pagename $$name --nonet --html $(top_srcdir)/docs/site.xsl $< > $@ || (rm $@ && exit 1) ; fi )
 
 %.html: %.html.tmp
-       @(if [ -x $(XMLLINT) ] ; then \
+       @(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \
+         if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \
          echo "Validating $@" ; \
-         $(XMLLINT) --nonet --format --valid $< > $@ || : ; fi );
+         $(XMLLINT) --nonet --format --valid $< > $@ || : ; \
+         else echo "missing XHTML1 DTD" ; fi ; fi );
 
 
 $(srcdir)/html/index.html: libvirt-api.xml newapi.xsl page.xsl sitemap.html.in
        -@(if [ -x $(XSLTPROC) ] ; then \
          echo "Rebuilding the HTML pages from the XML API" ; \
          $(XSLTPROC) --nonet $(srcdir)/newapi.xsl libvirt-api.xml ; fi )
-       -@(if [ -x $(XMLLINT) ] ; then \
+       -@(if [ -x $(XMLLINT) -a -x $(XMLCATALOG) ] ; then \
+         if $(XMLCATALOG) /etc/xml/catalog "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd" > /dev/null ; then \
          echo "Validating the resulting XHTML pages" ; \
-         $(XMLLINT) --nonet --valid --noout html/*.html ; fi );
+         $(XMLLINT) --nonet --valid --noout html/*.html ; \
+         else echo "missing XHTML1 DTD" ; fi ; fi );
 
 libvirt-api.xml libvirt-refs.xml: apibuild.py \
                $(srcdir)/../include/libvirt/*.h \

diff --git a/libvirt.spec.in b/libvirt.spec.in
index 479592d096e69d96a64871976360984633673a72..4aff4a5a435e6e8da1d3e67ae4d4e1d3024ea0df 100644 (file)
--- a/libvirt.spec.in
+++ b/libvirt.spec.in
@@ -72,6 +72,7 @@ Requires: parted
 BuildRequires: xen-devel
 %endif
 BuildRequires: libxml2-devel
+BuildRequires: xhtml1-dtds
 BuildRequires: readline-devel
 BuildRequires: ncurses-devel
 BuildRequires: gettext