From c3b7bca2ac77111f97b0e15e469836f78c7f451f Mon Sep 17 00:00:00 2001
From: Stefan Saraev <stefan@saraev.ca>
Date: Sun, 20 Jan 2013 04:19:01 +0200
Subject: [PATCH] automake: update & install gtk-doc.m4

---
 packages/toolchain/devel/autotools/automake/build           | 1 +
 .../toolchain/devel/autotools/automake/files/gtk-doc.m4     | 6 ++++++
 2 files changed, 7 insertions(+)

diff --git a/packages/toolchain/devel/autotools/automake/build b/packages/toolchain/devel/autotools/automake/build
index c59aaae725..38b473ce14 100755
--- a/packages/toolchain/devel/autotools/automake/build
+++ b/packages/toolchain/devel/autotools/automake/build
@@ -34,3 +34,4 @@ cd $PKG_BUILD
 make
 make install
 make prefix=$SYSROOT_PREFIX/usr install
+cp -P $ROOT/$PKG_DIR/files/gtk-doc.m4 $SYSROOT_PREFIX/usr/share/aclocal
diff --git a/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4 b/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4
index 2cfa1e7178..0ada151935 100644
--- a/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4
+++ b/packages/toolchain/devel/autotools/automake/files/gtk-doc.m4
@@ -6,6 +6,7 @@ dnl Usage:
 dnl   GTK_DOC_CHECK([minimum-gtk-doc-version])
 AC_DEFUN([GTK_DOC_CHECK],
 [
+  AC_REQUIRE([PKG_PROG_PKG_CONFIG])
   AC_BEFORE([AC_PROG_LIBTOOL],[$0])dnl setup libtool first
   AC_BEFORE([AM_PROG_LIBTOOL],[$0])dnl setup libtool first
 
@@ -33,6 +34,11 @@ AC_DEFUN([GTK_DOC_CHECK],
                         AC_MSG_ERROR([gtk-doc not installed and --enable-gtk-doc requested]))],
       [PKG_CHECK_EXISTS([gtk-doc >= $1],,
                         AC_MSG_ERROR([You need to have gtk-doc >= $1 installed to build $PACKAGE_NAME]))])
+    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
   fi
 
   AC_MSG_CHECKING([whether to build gtk-doc documentation])