Bump gtk-doc dependency to 1.15

Use the multiple source-directory support contained therein.

diff --git a/configure.in b/configure.in
index 9728134d32d302e4b5c831704b552b0b36d9803f..bc4e27b8d5c26554bfc1277510794e1c671b9c4b 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -2756,7 +2756,7 @@ dnl **************************
 dnl *** Checks for gtk-doc ***
 dnl **************************
 
-GTK_DOC_CHECK([1.11])
+GTK_DOC_CHECK([1.15])
 
 AC_ARG_ENABLE(man,
               [AC_HELP_STRING([--enable-man],

diff --git a/docs/reference/glib/Makefile.am b/docs/reference/glib/Makefile.am
index 553cbde72970087805cf74ab0ac05ec9e836b73d..a363584973d8e0a5244cb56b20b7f296fa3e862e 100644 (file)
--- a/docs/reference/glib/Makefile.am
+++ b/docs/reference/glib/Makefile.am
@@ -10,7 +10,7 @@ DOC_MODULE=glib
 DOC_MAIN_SGML_FILE=glib-docs.sgml
 
 # The directory containing the source code. Relative to $(srcdir)
-DOC_SOURCE_DIR=../../..
+DOC_SOURCE_DIR=../../../glib ../../../gmodule
 
 # Extra options to supply to gtkdoc-scan
 SCAN_OPTIONS=--deprecated-guards="G_DISABLE_DEPRECATED" --ignore-decorators="GLIB_VAR"