[GLib Documentation]

Add configure option to allow Glib source to be picked up at build time.

diff --git a/configure.ac b/configure.ac
index 6ea2707..ac8a44a 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -211,6 +211,21 @@ case "$host" in
 esac
 AM_CHECK_PYTHON_HEADERS(,AC_MSG_ERROR([Python headers not found]))
 
+# Glib documentation
+
+GLIBSRC=
+AC_MSG_CHECKING([for glib source directory to use for documentation])
+
+AC_ARG_WITH(glib-src,
+       [  --with-glib-src=PATH    Source directory for glib - needed to add docs to gir],
+       GLIBSRC=$withval
+) 
+AM_CONDITIONAL(WITH_GLIBSRC, test x"$GLIBSRC" != x)
+AC_SUBST(GLIBSRC)
+AC_MSG_RESULT([$GLIBSRC])
+
+
+
 AC_CONFIG_FILES([
 Makefile
 gir/Makefile

diff --git a/gir/Makefile.am b/gir/Makefile.am
index f1eb499..b50f10a 100644 (file)
--- a/gir/Makefile.am
+++ b/gir/Makefile.am
@@ -19,6 +19,26 @@ EXTRA_DIST += $(BASE_GIRSOURCES)
 
 INTROSPECTION_GIRS =
 
+# glib with source (to enable documentation)
+if WITH_GLIBSRC
+     GLib_2_0_gir_DOCSRC = $(GLIBSRC)/glib/*.c
+     GObject_2_0_gir_DOCSRC = $(GLIBSRC)/gobject/*.c
+     GModule_2_0_gir_DOCSRC = $(GLIBSRC)/gmodule/*.c
+     Gio_2_0_gir_DOCSRC = $(GLIBSRC)/gio/*.c
+else
+    GLib_2_0_gir_DOCSRC = 
+    GObject_2_0_gir_DOCSRC = 
+    GModule_2_0_gir_DOCSRC = 
+    Gio_2_0_gir_DOCSRC = 
+
+endif
+
+ # glib
+ GLIB_INCLUDEDIR=$(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
+ GLIB_LIBDIR=$(shell pkg-config --variable=libdir glib-2.0)
+
+
+
 # glib
 GLIB_INCLUDEDIR=$(shell pkg-config --variable=includedir glib-2.0)/glib-2.0
 GLIB_LIBDIR=$(shell pkg-config --variable=libdir glib-2.0)
@@ -30,7 +50,8 @@ GLIB_LIBRARY=glib-2.0
 endif
 
 GLib_2_0_gir_LIBS = $(GLIB_LIBRARY)
-GLib_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g --c-include="glib.h"
+GLib_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g --c-include="glib.h" \
+            $(GLib_2_0_gir_DOCSRC)
 GLib_2_0_gir_PACKAGES = glib-2.0
 GLib_2_0_gir_CFLAGS = $(CPPFLAGS) \
             -I$(GLIB_INCLUDEDIR) \
@@ -86,7 +107,9 @@ endif
 GModule-2.0.gir: GLib-2.0.gir
 
 GModule_2_0_gir_LIBS = $(GMODULE_LIBRARY)
-GModule_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g --c-include="gmodule.h"
+GModule_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g \
+            --c-include="gmodule.h" \
+            $(GModule_2_0_gir_DOCSRC)
 GModule_2_0_gir_PACKAGES = gmodule-2.0
 GModule_2_0_gir_INCLUDES = GLib-2.0
 GModule_2_0_gir_CFLAGS = \
@@ -117,7 +140,9 @@ endif
 Gio-2.0.gir: GObject-2.0.gir
 
 Gio_2_0_gir_LIBS = $(GIO_LIBRARY)
-Gio_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g --c-include="gio/gio.h"
+Gio_2_0_gir_SCANNERFLAGS = --noclosure --strip-prefix=g \
+            --c-include="gio/gio.h"
+            $(Gio_2_0_gir_DOCSRC)
 Gio_2_0_gir_PACKAGES = gio-2.0 $(GIO_UNIX_PACKAGES)
 Gio_2_0_gir_INCLUDES = GObject-2.0
 Gio_2_0_gir_CFLAGS = \