From: fliep <fliep@ddfedd41-794f-dd11-ae45-00112f111e67>
Date: Fri, 27 Nov 2009 21:49:24 +0000 (+0000)
Subject: Relaxed requirement for Gtk-doc 1.11, as Debian stable only has 1.10.
X-Git-Tag: v0.9~279
X-Git-Url: https://git.stderr.nl/gitweb?a=commitdiff_plain;h=8c695bf906638c208df1e0424fa10c0f993c2c1e;p=projects%2Fchimara%2Fchimara.git

Relaxed requirement for Gtk-doc 1.11, as Debian stable only has 1.10.
---

diff --git a/configure.ac b/configure.ac
index 5d0c1ec..5b2501d 100644
--- a/configure.ac
+++ b/configure.ac
@@ -27,10 +27,10 @@ AC_SUBST(LT_VERSION_INFO)
 ### REQUIREMENTS ##############################################################
 GTK_REQUIRED_VERSION=2.12
 GLIB_REQUIRED_VERSION=2.16
-GTK_DOC_REQUIRED_VERSION=1.11
+GTK_DOC_REQUIRED_VERSION=1.9
 AC_SUBST(GTK_REQUIRED_VERSION)
 AC_SUBST(GLIB_REQUIRED_VERSION)
-AC_SUBST(GTK_DOC_REQUIRED_VERSION) # Gtk-Doc 1.11 required
+AC_SUBST(GTK_DOC_REQUIRED_VERSION)
 
 ### DECLARE COMPILERS #########################################################
 
diff --git a/docs/reference/Makefile.am b/docs/reference/Makefile.am
index c039fb8..890de7d 100644
--- a/docs/reference/Makefile.am
+++ b/docs/reference/Makefile.am
@@ -34,7 +34,11 @@ MKTMPL_OPTIONS =
 
 # Extra options to supply to gtkdoc-mkhtml
 # The --path is because Gtk-doc is broken on non-distcheck vpath builds! Sigh.
-MKHTML_OPTIONS = --path="$(abs_builddir)"
+# But it only works on Gtk-doc 1.11 and higher. So if you want to do a vpath
+# build then uncomment this and require 1.11 in configure.ac. If you want to do
+# vpath build on Debian, then you're S.O.L. Complain to Gtk-doc and Debian.
+# MKHTML_OPTIONS = --path="$(abs_builddir)"
+MKHTML_OPTIONS = 
 
 # Extra options to supply to gtkdoc-fixref. Not normally needed.
 FIXXREF_OPTIONS =