[gdl] Fix reference to Gtk and GLib in documentation

[Sebastien Granjoux <sgranjoux src gnome org>]

commit 8ae362f1cb42c8f6754021021cdf4d914e4ab7e5
Author: SÃbastien Granjoux <seb sfo free fr>
Date:   Sun May 27 13:06:33 2012 +0200

    Fix reference to Gtk and GLib in documentation

 configure.in               |    6 ++++++
 docs/reference/Makefile.am |    7 +++++++
 gdl/gdl-switcher.c         |    4 ++--
 3 files changed, 15 insertions(+), 2 deletions(-)
---
diff --git a/configure.in b/configure.in
index 8f78637..deb6d6c 100644
--- a/configure.in
+++ b/configure.in
@@ -143,6 +143,12 @@ AC_SUBST(gdl_images_dir)
 # check for gtk-doc
 GTK_DOC_CHECK(1.4)
 
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+GTK_PREFIX="`$PKG_CONFIG --variable=prefix gtk+-3.0`"
+
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(GTK_PREFIX)
+
 GOBJECT_INTROSPECTION_CHECK([0.6.7])
 
 AC_OUTPUT([
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index e5dc924..a6fb678 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -82,6 +82,13 @@ GTKDOC_LIBS=$(GDL_DEPENDENCIES_LIBS) \
 	-L$(top_builddir)/gdl \
 	-lgdl-3
 
+# Extra options to supply to gtkdoc-fixref
+FIXXREF_OPTIONS= \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+	--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gio \
+	--extra-dir=$(GTK_PREFIX)/share/gtk-doc/html/gtk
+
 # This includes the standard gtk-doc make rules, copied by gtkdocize.
 include $(top_srcdir)/gtk-doc.make
 
diff --git a/gdl/gdl-switcher.c b/gdl/gdl-switcher.c
index 0726209..6da854e 100644
--- a/gdl/gdl-switcher.c
+++ b/gdl/gdl-switcher.c
@@ -842,7 +842,7 @@ gdl_switcher_new (void)
  * from the @stock_id parameter.  If this is %NULL, then the @pixbuf_icon
  * parameter is used.  Failing that, the %GTK_STOCK_NEW stock icon is used.
  * The text label for the button is specified using the @label parameter.  If
- * it is %NUll then a default incrementally numbered label is used instead.
+ * it is %NULL then a default incrementally numbered label is used instead.
  */
 static void
 gdl_switcher_add_button (GdlSwitcher *switcher, const gchar *label,
@@ -965,7 +965,7 @@ gdl_switcher_select_button (GdlSwitcher *switcher, gint switcher_id)
  * icon taken preferentially from the @stock_id parameter.  If this parameter is
  * %NULL, then the @pixbuf_icon parameter is used.  Failing that, the
  * %GTK_STOCK_NEW stock icon is used.  The text label for the button is specified
- * using the @label parameter.  If it is %NUll then a default incrementally
+ * using the @label parameter.  If it is %NULL then a default incrementally
  * numbered label is used instead.
  */
 gint