diff options
| author | Michael Biebl <biebl@debian.org> | 2011-11-12 01:36:14 +0100 |
|---|---|---|
| committer | Michael Biebl <biebl@debian.org> | 2011-11-12 01:36:14 +0100 |
| commit | b436a68a20ff3114ded32a7a3d70cdd4954039f9 (patch) | |
| tree | 3e7d6971c35b47b6e67604f54d434d909be0f228 /m4 | |
| parent | 485d149fe80915d94ed49ea6c2c0552cf7a3e79a (diff) | |
Imported Upstream version 0.9.2.0 upstream/0.9.2.0
Diffstat (limited to '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 2cfa1e71..0ada1519 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]) |