hal ChangeLog,1.901,1.902 configure.in,1.127,1.128

[Richard Hughes]

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

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-05-14  Richard Hughes  <richard at hughsie.com>

	* configure.in:
	* doc/spec/Makefile.am:
	Change the docbook2html check in the configure script to check for
	xmlto. Also change s/DOCBOOK/XMLTO/ in the Makefile.


Index: ChangeLog
===================================================================
RCS file: /cvs/hal/hal/ChangeLog,v
retrieving revision 1.901
retrieving revision 1.902
diff -u -d -r1.901 -r1.902
--- ChangeLog	14 May 2006 19:16:56 -0000	1.901
+++ ChangeLog	14 May 2006 19:33:19 -0000	1.902
@@ -1,3 +1,10 @@
+2006-05-14  Richard Hughes  <richard at hughsie.com>
+
+	* configure.in:
+	* doc/spec/Makefile.am:
+	Change the docbook2html check in the configure script to check for
+	xmlto. Also change s/DOCBOOK/XMLTO/ in the Makefile.
+
 2006-05-14  Joe Marcus Clarke <marcus at freebsd.org>
 
 	* tools/freebsd/Makefile.am:

Index: configure.in
===================================================================
RCS file: /cvs/hal/hal/configure.in,v
retrieving revision 1.127
retrieving revision 1.128
diff -u -d -r1.127 -r1.128
--- configure.in	14 May 2006 18:49:53 -0000	1.127
+++ configure.in	14 May 2006 19:33:20 -0000	1.128
@@ -75,7 +75,7 @@
 # Taken from dbus
 AC_ARG_ENABLE(ansi,             [  --enable-ansi           enable -ansi -pedantic gcc flags],enable_ansi=$enableval,enable_ansi=no)
 AC_ARG_ENABLE(verbose-mode,     [  --enable-verbose-mode   support verbose debug mode],enable_verbose_mode=$enableval,enable_verbose_mode=$USE_MAINTAINER_MODE)
-AC_ARG_ENABLE(docbook-docs,     [  --enable-docbook-docs   build documentation (requires docbook2html)],enable_docbook_docs=$enableval,enable_docbook_docs=auto)
+AC_ARG_ENABLE(docbook-docs,     [  --enable-docbook-docs   build documentation (requires xmlto)],enable_docbook_docs=$enableval,enable_docbook_docs=auto)
 
 
 GTK_DOC_CHECK([1.3])
@@ -291,11 +291,11 @@
 
 # DocBook Documentation
 
-AC_PATH_PROG(DOCBOOK, docbook2html, no)
+AC_PATH_PROG(XMLTO, xmlto, no)
 
 AC_MSG_CHECKING([whether to build DocBook documentation])
 
-if test x$DOCBOOK = xno ; then
+if test x$XMLTO = xno ; then
     have_docbook=no
 else
     have_docbook=yes
@@ -469,7 +469,7 @@
         compiler:                   ${CC}
         cflags:                     ${CFLAGS}
         cppflags:                   ${CPPFLAGS}
-        DocBook:                    ${DOCBOOK}
+        xmlto:                      ${XMLTO}
         User for HAL:               ${HAL_USER}
         Group for HAL:              ${HAL_GROUP}
         hald pidfile:               ${HALD_PID_FILE}