PolicyKit ChangeLog,1.14,1.15 configure.in,1.4,1.5

[David Zeuthen]

Update of /cvs/hal/PolicyKit
In directory kemper:/tmp/cvs-serv23719

Modified Files:
	ChangeLog configure.in 
Log Message:
2006-03-29  David Zeuthen  <davidz at redhat.com>

        * configure.in: Add docbook detection

        * doc/spec/*: New files

        * polkitd/polkit-session.c (polkit_session_finalize): Free the
        questions to prevent memory leak



Index: ChangeLog
===================================================================
RCS file: /cvs/hal/PolicyKit/ChangeLog,v
retrieving revision 1.14
retrieving revision 1.15
diff -u -d -r1.14 -r1.15
--- ChangeLog	27 Mar 2006 08:37:28 -0000	1.14
+++ ChangeLog	29 Mar 2006 16:15:28 -0000	1.15
@@ -1,3 +1,12 @@
+2006-03-29  David Zeuthen  <davidz at redhat.com>
+
+	* configure.in: Add docbook detection
+	
+	* doc/spec/*: New files
+	
+	* polkitd/polkit-session.c (polkit_session_finalize): Free the
+	questions to prevent memory leak
+
 2006-03-27  Richard Hughes  <richard at hughsie.com>
 
 	* .cvsignore, doc/.cvsignore, libpolkit/.cvsignore,

Index: configure.in
===================================================================
RCS file: /cvs/hal/PolicyKit/configure.in,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- configure.in	15 Mar 2006 00:33:35 -0000	1.4
+++ configure.in	29 Mar 2006 16:15:28 -0000	1.5
@@ -48,6 +48,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)
 
 GTK_DOC_CHECK([1.3])
 
@@ -147,6 +148,35 @@
 
 AC_CHECK_FUNCS(getgrouplist)
 
+# DocBook Documentation
+
+AC_PATH_PROG(DOCBOOK, docbook2html, no)
+
+AC_MSG_CHECKING([whether to build DocBook documentation])
+
+if test x$DOCBOOK = xno ; then
+    have_docbook=no
+else
+    have_docbook=yes
+fi
+
+if test x$enable_docbook_docs = xauto ; then
+    if test x$have_docbook = xno ; then
+        enable_docbook_docs=no
+    else
+        enable_docbook_docs=yes
+    fi
+fi
+
+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])
+    fi
+fi
+
+AM_CONDITIONAL(DOCBOOK_DOCS_ENABLED, test x$enable_docbook_docs = xyes)
+AC_MSG_RESULT(yes)
+
 AS_AC_EXPAND(LOCALSTATEDIR, $localstatedir)
 AS_AC_EXPAND(SYSCONFDIR, $sysconfdir)
 AS_AC_EXPAND(DATADIR, $datadir)
@@ -324,6 +354,8 @@
 tools/Makefile
 doc/Makefile
 doc/api/Makefile
+doc/spec/Makefile
+doc/spec/polkit-spec.xml
 privileges/Makefile
 ])
 
@@ -346,6 +378,7 @@
         compiler:                   ${CC}
         cflags:                     ${CFLAGS}
         cppflags:                   ${CPPFLAGS}
+        DocBook:                    ${DOCBOOK}
         user for PolicyKit:         ${POLKIT_USER}
         group for PolicyKit:        ${POLKIT_GROUP}
         pidfile for polkitd:        ${POLKITD_PID_FILE}
@@ -361,6 +394,7 @@
         Maintainer mode:            ${USE_MAINTAINER_MODE}
         Building verbose mode:      ${enable_verbose_mode}
         Building api docs:          ${enable_gtk_doc}
+        Building docs:              ${enable_docbook_docs}
 "
 
 # (distro-tweaks required)