dbus ChangeLog,1.484,1.485 README,1.4,1.5 configure.in,1.82,1.83

[Owen Fraser-Green]

Update of /cvs/dbus/dbus
In directory pdx:/tmp/cvs-serv16690

Modified Files:
	ChangeLog README configure.in 
Log Message:
Added mono documentation.


Index: ChangeLog
===================================================================
RCS file: /cvs/dbus/dbus/ChangeLog,v
retrieving revision 1.484
retrieving revision 1.485
diff -u -d -r1.484 -r1.485
--- a/ChangeLog	11 May 2004 18:31:33 -0000	1.484
+++ b/ChangeLog	15 May 2004 11:44:44 -0000	1.485
@@ -1,3 +1,10 @@
+2004-05-15  Owen Fraser-Green  <owen at discobabe.net>
+
+	* mono/Makefile.am: Added SUBDIR for docs
+	* mono/doc/*: Added documentation framework
+	* configure.in: Added monodoc check
+	* README: Added description of mono configure flags
+
 2004-05-11  John (J5) Palmieri  <johnp at redhat.com>:
 
 	* doc/dbus-specification.xml: Added a "Required" column to the 

Index: README
===================================================================
RCS file: /cvs/dbus/dbus/README,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -d -r1.4 -r1.5
--- a/README	29 Apr 2003 21:56:37 -0000	1.4
+++ b/README	15 May 2004 11:44:44 -0000	1.5
@@ -13,6 +13,8 @@
 
   --enable-qt      enable Qt-friendly client library
   --enable-glib    enable GLib-friendly client library
+  --enable-mono    enable mono bindings
+  --enable-mono-docs build mono documentation (requires monodoc)
   --enable-tests   enable unit test code
   --enable-ansi    enable -ansi -pedantic gcc flags
   --enable-verbose-mode support verbose debug mode

Index: configure.in
===================================================================
RCS file: /cvs/dbus/dbus/configure.in,v
retrieving revision 1.82
retrieving revision 1.83
diff -u -d -r1.82 -r1.83
--- a/configure.in	13 Apr 2004 11:39:41 -0000	1.82
+++ b/configure.in	15 May 2004 11:44:44 -0000	1.83
@@ -36,6 +36,7 @@
 AC_ARG_ENABLE(abstract-sockets, [  --enable-abstract-sockets  use abstract socket namespace (linux only)],enable_abstract_sockets=$enableval,enable_abstract_sockets=auto)
 AC_ARG_ENABLE(gcj,              [  --enable-gcj          build gcj bindings],enable_gcj=$enableval,enable_gcj=no)
 AC_ARG_ENABLE(mono,             [  --enable-mono         build mono bindings],enable_mono=$enableval,enable_mono=auto)
+AC_ARG_ENABLE(mono_docs,        [  --enable-mono-docs    build mono docs],enable_mono_docs=$enableval,enable_mono_docs=auto)
 AC_ARG_ENABLE(python,           [  --enable-python       build python bindings],enable_python=$enableval,enable_python=auto)
 
 
@@ -211,6 +212,41 @@
 
 AM_CONDITIONAL(DBUS_USE_MCS, test x$enable_mono = xyes)
 
+#### Look for monodoc
+MONODOC_REQUIRED_VERSION=0.15
+AC_SUBST(MONODOC_REQUIRED_VERSION)
+PKG_CHECK_MODULES(MONODOC_DEPENDENCY, monodoc >= $MONODOC_REQUIRED_VERSION, have_monodoc=yes, have_monodoc=no)
+
+if test x$enable_mono_docs = xyes; then
+    if test x$have_monodoc = xno ; then
+	AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])
+    else
+        AC_PATH_PROG(MONODOC, monodoc, no)
+        if test x$MONODOC = xno; then
+           AC_MSG_ERROR([Building Mono docs explicitly required, but monodoc not found])	
+	fi
+    fi
+fi
+
+if test x$enable_mono_docs = xauto ; then
+    if test x$have_monodoc = xno ; then
+        enable_mono_docs=no
+	MONODOC=
+    else
+        AC_PATH_PROG(MONODOC, monodoc, no)
+        if test x$MONODOC = xno; then
+           enable_mono_docs=no
+           MONODOC=
+	else
+	   enable_mono_docs=yes
+        fi
+    fi
+fi
+
+AC_SUBST(MONODOC)
+
+AM_CONDITIONAL(ENABLE_MONODOC, test "x$enable_mono_docs" = "xyes")
+
 changequote(,)dnl
 # let ourselves use our own unstable API
 CPPFLAGS="-DDBUS_API_SUBJECT_TO_CHANGE=1 $CPPFLAGS"
@@ -1024,6 +1060,7 @@
 gcj/org/freedesktop/dbus/Makefile
 mono/Makefile
 mono/example/Makefile
+mono/doc/Makefile
 bus/Makefile
 tools/Makefile
 test/Makefile
@@ -1094,6 +1131,7 @@
         Building GLib bindings:   ${have_glib}
         Building Python bindings: ${have_python}
 	Building Mono bindings:	  ${enable_mono}
+	Building Mono docs:	  ${enable_mono_docs}
         Building GTK+ tools:      ${have_gtk}
         Building X11 code:        ${enable_x11}
         Building Doxygen docs:    ${enable_doxygen_docs}