hal ChangeLog,1.939,1.940 configure.in,1.136,1.137

[Danny Kukawka]

Update of /cvs/hal/hal
In directory kemper:/tmp/cvs-serv15521

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-07-24  Danny Kukawka  <danny.kukawka at web.de>

        Fixed build hal-spec.html to avoid invalid chars in the html page and
        closed fd.o bug #6986:

        * configure.in: replaced check for xmlto with old check for
        docbook2html and additional check for xmllint

        * doc/spec/Makefile.am: added xmllint to resolve xinclude for docbook,
        readded docbook2html command



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.939
retrieving revision 1.940
diff -u -d -r1.939 -r1.940
--- ChangeLog	20 Jul 2006 17:23:21 -0000	1.939
+++ ChangeLog	24 Jul 2006 11:49:15 -0000	1.940
@@ -1,3 +1,14 @@
+2006-07-24  Danny Kukawka  <danny.kukawka at web.de>
+
+	Fixed build hal-spec.html to avoid invalid chars in the html page and 
+	closed fd.o bug #6986:
+
+	* configure.in: replaced check for xmlto with old check for 
+	docbook2html and additional check for xmllint
+
+	* doc/spec/Makefile.am: added xmllint to resolve xinclude for docbook,
+	readded docbook2html command 
+
 2006-07-20  Danny Kukawka  <danny.kukawka at web.de>
 
 	* configure.in: fix configure and remove no longer available 

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.136
retrieving revision 1.137
diff -u -d -r1.136 -r1.137
--- configure.in	20 Jul 2006 17:23:21 -0000	1.136
+++ configure.in	24 Jul 2006 11:49:15 -0000	1.137
@@ -301,18 +301,25 @@
 
 # DocBook Documentation
 
-AC_PATH_PROG(XMLTO, xmlto, no)
-
+AC_PATH_PROG(DOCBOOK, docbook2html, no)
 AC_MSG_CHECKING([whether to build DocBook documentation])
 
-if test x$XMLTO = xno ; then
+if test x$DOCBOOK = xno ; then
     have_docbook=no
 else
     have_docbook=yes
 fi
 
+AC_PATH_PROG(XMLLINT, xmllint, no)
+
+if test x$XMLLINT = xno ; then
+    have_xmllint=no
+else
+    have_xmllint=yes
+fi
+
 if test x$enable_docbook_docs = xauto ; then
-    if test x$have_docbook = xno ; then
+    if test x$have_docbook = xno || test x$have_xmllint = xno ; then
         enable_docbook_docs=no
     else
         enable_docbook_docs=yes
@@ -321,7 +328,10 @@
 
 if test x$enable_docbook_docs = xyes; then
     if test x$have_docbook = xno; then
-	AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found])
+        AC_MSG_ERROR([Building DocBook docs explicitly required, but DocBook not found])
+    fi
+    if test x$ve_xmllint = xno; then
+        AC_MSG_ERROR([Building DocBook docs explicitly required, but xmllint not found])
     fi
 fi
 
@@ -477,7 +487,8 @@
         compiler:                   ${CC}
         cflags:                     ${CFLAGS}
         cppflags:                   ${CPPFLAGS}
-        xmlto:                      ${XMLTO}
+	docbook2html:               ${DOCBOOK}
+	xmllint:                    ${XMLLINT}
         User for HAL:               ${HAL_USER}
         Group for HAL:              ${HAL_GROUP}
         hald pidfile:               ${HALD_PID_FILE}