Add crossreferences to glib/gobject/gstream docs.

Original commit message from CVS:
* configure.ac:
* docs/plugins/Makefile.am:
Add crossreferences to glib/gobject/gstream docs.

diff --git a/ChangeLog b/ChangeLog
index 7a4882e..f6cd2df 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,9 @@
+2007-02-13  Stefan Kost  <ensonic@users.sf.net>
+
+       * configure.ac:
+       * docs/plugins/Makefile.am:
+         Add crossreferences to glib/gobject/gstream docs.
+
 2007-02-12  Stefan Kost  <ensonic@users.sf.net>
 
        * gst/synaesthesia/gstsynaesthesia.c: (gst_synaesthesia_init),

diff --git a/configure.ac b/configure.ac
index 4d076ba..34f38e0 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -177,7 +177,10 @@ dnl *** checks for library functions ***
 dnl Check for a way to display the function name in debug output
 GST_CHECK_FUNCTION
 
-dnl *** checks for dependancy libraries ***
+dnl *** checks for dependency libraries ***
+
+dnl GLib is required
+GST_GLIB_CHECK([2.6])
 
 dnl liboil is required
 PKG_CHECK_MODULES(LIBOIL, liboil-0.3 >= 0.3.6, HAVE_LIBOIL=yes, HAVE_LIBOIL=no)
@@ -198,6 +201,14 @@ dnl check for "check", unit testing library/header
 AM_PATH_CHECK(0.9.2, HAVE_CHECK=yes, HAVE_CHECK=no)
 AM_CONDITIONAL(HAVE_CHECK, test "x$HAVE_CHECK" = "xyes")
 
+dnl Check for documentation xrefs
+GLIB_PREFIX="`$PKG_CONFIG --variable=prefix glib-2.0`"
+GST_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-$GST_MAJORMINOR`"
+GSTPB_PREFIX="`$PKG_CONFIG --variable=prefix gstreamer-plugins-base-$GST_MAJORMINOR`"
+AC_SUBST(GLIB_PREFIX)
+AC_SUBST(GST_PREFIX)
+AC_SUBST(GSTPB_PREFIX)
+
 dnl *** set variables based on configure arguments ***
 
 dnl set license and copyright notice

diff --git a/docs/plugins/Makefile.am b/docs/plugins/Makefile.am
index c6ead19..09003a8 100644 (file)
--- a/docs/plugins/Makefile.am
+++ b/docs/plugins/Makefile.am
@@ -53,8 +53,11 @@ SCAN_OPTIONS=
 MKDB_OPTIONS=--sgml-mode
 
 # Extra options to supply to gtkdoc-fixref.
-# FIXME get the location of the installed gstreamer docs
-#FIXXREF_OPTIONS=--extra-dir=../gst/html
+FIXXREF_OPTIONS=--extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/gobject \
+       --extra-dir=$(GLIB_PREFIX)/share/gtk-doc/html/glib \
+       --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-@GST_MAJORMINOR@ \
+       --extra-dir=$(GST_PREFIX)/share/gtk-doc/html/gstreamer-libs-@GST_MAJORMINOR@ \
+       --extra-dir=$(GSTPB_PREFIX)/share/gtk-doc/html/gst-plugins-base-libs-@GST_MAJORMINOR@
 
 # Used for dependencies.
 HFILE_GLOB=$(DOC_SOURCE_DIR)/*/*/*.h