Re: GTKDOC_DEPS in recent gtk-doc.m4

[Simon Josefsson <simon josefsson org>]

Nicola Fontana <ntd entidi it> writes:

> On Sun, 20 Nov 2011 22:13:34 +0100
> Simon Josefsson <simon josefsson org> wrote:
>
>> Hi!  I'm using gtk-doc in for example GNU Libtasn1 and recently upgraded
>> to the latest gtk-doc.m4 from your git repo, which contains this new
>> piece of code:
>> 
>>     dnl don't check for glib if we build glib
>>     if test "x$PACKAGE_NAME" != "xglib"; then
>>       dnl don't fail if someone does not have glib
>>       PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
>>     fi
>
> It should be:
>        PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0
>>= 2.10.0,,[:])
>
> glib is needed to get additional information if your library is based on
> GObject, such as type inheritance.

Thank you, I can confirm that this works for Libtasn1 and that the
GTK-DOC output looks fine.  During ./configure it now prints

checking for GTKDOC_DEPS... no

but instead of failing with the error message I quoted earlier, it will
now proceed.

Could the fix be pushed?  If a git-format-patch makes anything easier,
it is included below.

/Simon

>From 469308546237e3b592e7d53943824482ef862252 Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon josefsson org>
Date: Thu, 1 Dec 2011 20:51:26 +0100
Subject: [PATCH] gtk-doc.m4: Don't fail if glib is not available.

---
 gtk-doc.m4 |    2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diff --git a/gtk-doc.m4 b/gtk-doc.m4
index 0ada151..a2d5932 100644
--- a/gtk-doc.m4
+++ b/gtk-doc.m4
@@ -37,7 +37,7 @@ AC_DEFUN([GTK_DOC_CHECK],
     dnl don't check for glib if we build glib
     if test "x$PACKAGE_NAME" != "xglib"; then
       dnl don't fail if someone does not have glib
-      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,)
+      PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0,,[:])
     fi
   fi
 
-- 
1.7.2.5