[gtk-doc] gtk-doc.m4: only get glib_deps if we're not building glib and make it nonfatal



commit db374e766d85cc15c084542d0aae6c9df73c8737
Author: Stefan Sauer <ensonic users sf net>
Date:   Thu Sep 8 18:32:35 2011 +0200

    gtk-doc.m4: only get glib_deps if we're not building glib and make it nonfatal
    
    If we're builing glib, we want uninstalled glib. If we're building docs for a
    non glib library we won't run scanobj.

 gtk-doc.m4 |    6 +++++-
 1 files changed, 5 insertions(+), 1 deletions(-)
---
diff --git a/gtk-doc.m4 b/gtk-doc.m4
index fd532d6..0ada151 100644
--- a/gtk-doc.m4
+++ b/gtk-doc.m4
@@ -34,7 +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]))])
-    PKG_CHECK_MODULES(GTKDOC_DEPS, glib-2.0 >= 2.10.0 gobject-2.0  >= 2.10.0)
+    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])



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]