diff options
| author | Ted Gould <ted@gould.cx> | 2011-09-28 12:45:50 -0500 |
|---|---|---|
| committer | Ted Gould <ted@gould.cx> | 2011-09-28 12:45:50 -0500 |
| commit | 334e44dbb08303113ece1baf163ab7d9dd5561a4 (patch) | |
| tree | 765b00b205818a44b7059322215814abe43d9c8c /m4/gtk-doc.m4 | |
| parent | e57397eda0ea76153a6d9aa9e34ba7e214bd50ad (diff) | |
| parent | a0119770c6e87433e7b43ec78fe1b17aaf315d71 (diff) | |
| download | libayatana-appindicator-334e44dbb08303113ece1baf163ab7d9dd5561a4.tar.gz libayatana-appindicator-334e44dbb08303113ece1baf163ab7d9dd5561a4.tar.bz2 libayatana-appindicator-334e44dbb08303113ece1baf163ab7d9dd5561a4.zip | |
Import upstream version 0.4.1
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]) |