[nautilus-actions] gtk-doc and gnome-doc-utils are no more mandatory packages

[Pierre Wieser <pwieser src gnome org>]

commit c2f12395c5744c488e09dda3dbb3fbed92eb8aad
Author: Pierre Wieser <pwieser trychlos org>
Date:   Fri Nov 25 23:28:16 2011 +0100

    gtk-doc and gnome-doc-utils are no more mandatory packages

 ChangeLog    |    2 ++
 configure.ac |   20 +++++++++++---------
 2 files changed, 13 insertions(+), 9 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 1b1e356..4e74c5a 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2011-11-25 Pierre Wieser <pwieser trychlos org>
 
+	* configure.ac: gtk-doc and gnome-doc-utils are no more mandatory packages.
+
 	* Makefile.am:
 	No more try to rebuild manuals when making distcheck.
 	Move gnome-doc-utils.make and gtk-doc.make to MAINTAINERCLEANFILES target.
diff --git a/configure.ac b/configure.ac
index 0ad9492..a352f16 100644
--- a/configure.ac
+++ b/configure.ac
@@ -91,7 +91,6 @@ AC_PROG_MAKE_SET
 
 # Gnome stuff
 GNOME_COMMON_INIT
-GNOME_DOC_INIT
 GNOME_MAINTAINER_MODE_DEFINES
 NA_LINK_AS_NEEDED
 NA_GNOME_COMPILE_WARNINGS([],[-ansi -Wno-overlength-strings -Wformat=2])
@@ -156,18 +155,21 @@ AC_SUBST([NAUTILUS_ACTIONS_LIBS])
 #   by gtk-doc.make
 # - API documentation should not be built (would be incomplete) when deprecated
 #   symbols are not enabled
-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])
+m4_ifdef([GTK_DOC_CHECK], [
+GTK_DOC_CHECK([1.15],[--flavour no-tmpl])
+],[
+AM_CONDITIONAL([ENABLE_GTK_DOC], false)
+])
 if test "x${enable_gtk_doc}" = "xyes" -a "${enable_deprecated}" = "no"; then
 	AC_MSG_WARN([API documentation will be incomplete as deprecated symbols are disabled])
 fi
 
+m4_ifdef([GNOME_DOC_INIT], [
+GNOME_DOC_INIT
+][
+AM_CONDITIONAL([HAVE_GNOME_DOC_UTILS], false)
+])
+
 # defines log domains when in maintainer mode
 NA_LOG_DOMAINS