[nautilus-actions] Fix doc generation with gtk-doc >= 1.15

[Pierre Wieser <pwieser src gnome org>]

commit 1ed8cc5af0faf2d030b38735602661b33f411900
Author: Pierre Wieser <pwieser trychlos org>
Date:   Thu Dec 30 19:46:53 2010 +0100

    Fix doc generation with gtk-doc >= 1.15

 ChangeLog                  |    7 +++++++
 configure.ac               |   19 +++++++++++++------
 docs/reference/Makefile.am |    9 +++++++++
 src/core/na-icontext.c     |    4 ++--
 4 files changed, 31 insertions(+), 8 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index cad7147..fd26e1c 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,12 @@
 2010-12-30 Pierre Wieser <pwieser trychlos org>
 
+	* configure.ac:	Check for gtk-doc >= 1.15.
+
+	* docs/reference/Makefile.am:
+	Handle multiple source directories when gtk-doc >= 1.15.
+
+	* src/core/na-icontext.c: Fix documentation comment.
+
 	* src/io-desktop/nadp-desktop-file.c (nadp_desktop_file_set_locale_string):
 	No more write the encoding part of the locale in the .desktop file.
 
diff --git a/configure.ac b/configure.ac
index bfd5b88..16652ea 100644
--- a/configure.ac
+++ b/configure.ac
@@ -29,14 +29,12 @@
 AC_PREREQ([2.53])
 
 AC_INIT([Nautilus-Actions],[3.0.4],[maintainer nautilus-actions org],,[http://www.nautilus-actions.org])
-m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 
+m4_ifdef([AM_SILENT_RULES], [AM_SILENT_RULES])
 AC_CANONICAL_TARGET
-
 AM_INIT_AUTOMAKE
 
 AC_CONFIG_SRCDIR([src/plugin-menu/nautilus-module.c])
-
 AC_CONFIG_HEADERS([src/config.h])
 
 AC_CONFIG_FILES([
@@ -101,9 +99,6 @@ AC_SUBST([AM_CFLAGS],["${AM_CFLAGS} ${WARN_CFLAGS}"])
 # GLib marshaling
 AC_PATH_PROG(GLIB_GENMARSHAL, glib-genmarshal)
 
-# check for gtk-doc
-GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
-
 # libtool
 AM_PROG_LIBTOOL
 
@@ -154,6 +149,18 @@ NA_CHECK_MODULE([NAUTILUS_EXTENSION],[libnautilus-extension >= 2.8])
 AC_SUBST([NAUTILUS_ACTIONS_CFLAGS])
 AC_SUBST([NAUTILUS_ACTIONS_LIBS])
 
+# check for gtk-doc
+# Starting with gtk-doc 1.15, multiple source dirs are directly handled
+# by gtk-doc.make
+GTK_DOC_CHECK([1.10],[--flavour no-tmpl])
+have_gtk_doc_115="no"
+if test "x${enable_gtk_doc}" = "xyes"; then
+	AC_MSG_CHECKING([for gtk-doc >= 1.15])
+	PKG_CHECK_EXISTS([gtk-doc >= 1.15],[have_gtk_doc_115="yes"],[have_gtk_doc_115="no"])
+	AC_MSG_RESULT([${have_gtk_doc_115}])
+fi
+AM_CONDITIONAL([HAVE_GTK_DOC_115], [test x$have_gtk_doc_115 = xyes])
+
 # defines log domains when in maintainer mode
 NA_LOG_DOMAINS
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index 5ce5603..670f9d8 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -64,10 +64,19 @@ SCAN_OPTIONS = \
 	$(NULL)
 
 # The directory containing the source code. Relative to $(srcdir)
+# Starting with gtk-doc 1.15, multiple source dirs are directly handled
+# by gtk-doc.make
+if HAVE_GTK_DOC_115
+DOC_SOURCE_DIR = \
+	$(top_srcdir)/src/api 						\
+	$(top_srcdir)/src/core						\
+	$(NULL)
+else
 DOC_SOURCE_DIR = \
 	$(top_srcdir)/src/api 						\
 	--source-dir=$(top_srcdir)/src/core			\
 	$(NULL)
+endif
 
 # Headers to ignore
 IGNORE_HFILES = \
diff --git a/src/core/na-icontext.c b/src/core/na-icontext.c
index e09b0ce..80651e0 100644
--- a/src/core/na-icontext.c
+++ b/src/core/na-icontext.c
@@ -297,7 +297,7 @@ na_icontext_is_all_mimetypes( const NAIContext *context )
  *
  * Prepares the specified #NAIContext just after it has been readen.
  *
- * <unorderedlist>
+ * <itemizedlist>
  *   <listitem>
  *     <para>
  *       This converts a 'all/allfiles' mimetype to 'all/all' + 'file' scheme.
@@ -309,7 +309,7 @@ na_icontext_is_all_mimetypes( const NAIContext *context )
  *       in order to optimize computation time;
  *     </para>
  *   </listitem>
- * </unorderedlist>
+ * </itemizedlist>
  *
  * Since: 2.30
  */