diff options
| author | Ken VanDine <ken.vandine@canonical.com> | 2011-09-28 14:22:30 -0400 |
|---|---|---|
| committer | Ken VanDine <ken.vandine@canonical.com> | 2011-09-28 14:22:30 -0400 |
| commit | 641031fc25e1fa12228c47437bad46db0e0a7292 (patch) | |
| tree | c52d711c524d9b13c59718b11442ffd3e4effc40 /m4/gtk-doc.m4 | |
| parent | 2d4793adccf26c9bfcea40cb47fe615ce7c3f30d (diff) | |
| parent | c93b59dcdd7d9e4fcfa3b6a4cdb2f06bb41d9156 (diff) | |
| download | libayatana-appindicator-641031fc25e1fa12228c47437bad46db0e0a7292.tar.gz libayatana-appindicator-641031fc25e1fa12228c47437bad46db0e0a7292.tar.bz2 libayatana-appindicator-641031fc25e1fa12228c47437bad46db0e0a7292.zip | |
* New upstream release (0.4.0).
* Fix VAPI file for Vala bindings (LP: #789588)
* New upstream release (0.4.1).
* Fix build.
Diffstat (limited to 'm4/gtk-doc.m4')
| -rw-r--r-- | m4/gtk-doc.m4 | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/m4/gtk-doc.m4 b/m4/gtk-doc.m4 index 2cfa1e7..0ada151 100644 --- a/m4/gtk-doc.m4 +++ b/m4/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]) |