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

git-svn-id: http://lassie.dyndns-server.com/svn/gargoyle-gtk@186 ddfedd41-794f-dd11-ae45-00112f111e67

diff --git a/configure.ac b/configure.ac
index 5d0c1ecbb05df3fd47ea57b652eae9971b0b9d37..5b2501dcf6c836b4ad4be920a62142d4590e6457 100644 (file)
--- 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 c039fb8abe30699da72028164e47292e646c9a02..890de7d0f9e79737757d7271c4b07248ec245858 100644 (file)
--- 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 =