From 90285b0643d23059bdf28aff4afd337f91a556a6 Mon Sep 17 00:00:00 2001 From: Ryan Lortie Date: Mon, 12 Jul 2010 15:30:26 -0400 Subject: [PATCH] Bump gtk-doc dependency to 1.15 Use the multiple source-directory support contained therein. --- configure.in | 2 +- docs/reference/glib/Makefile.am | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/configure.in b/configure.in index 9728134..bc4e27b 100644 --- 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 553cbde..a363584 100644 --- 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" -- 2.7.4