From 1dddd733e9c53e4a6d71236401e5b2471ed197b7 Mon Sep 17 00:00:00 2001
From: Thomas White <taw@physics.org>
Date: Thu, 22 Mar 2012 17:24:03 +0100
Subject: Require gtk-doc 1.9 or above, and document changes

---
 README       | 24 ++++++++++++++++++++++++
 configure.ac |  2 +-
 2 files changed, 25 insertions(+), 1 deletion(-)

diff --git a/README b/README
index 6a16d13a..5f250b14 100644
--- a/README
+++ b/README
@@ -131,6 +131,30 @@ then your version of FFTW3 is not compiled in a suitable way.  You'll need to
 install it again (from source) adding "--enable-shared" to its ./configure
 command line.
 
+If you get an error about "cairo_surface_show_page" in src/scaling-report.c,
+simply edit the file and comment that line out.  Partialator will then not be
+able to produce a useful scaling report, but the rest of CrystFEL will work
+properly.
+
+If you are installing from Git, the following extra things apply:
+
+- You must run "./autogen.sh" to generate "configure" and other files before
+  proceeding as detailed above.
+
+- If you have an old version of Automake (less than 1.10), or an old version of
+  Autoconf (less than 2.60), you'll need to add the following line near the top
+  of Makefile.am:
+
+  docdir = ${datadir}/doc/${PACKAGE}
+
+- If your Automake version is less than 1.11, you'll need to comment out the
+  reference to AM_SILENT_RULES in configure.ac, like this:
+
+  dnl AM_SILENT_RULES([yes])
+
+- You will not be able to use the "--enable-gtk-doc" option to configure unless
+  you have at least version 1.9 of gtk-doc installed.
+
 
 Program name
 ------------
diff --git a/configure.ac b/configure.ac
index 6686cfd8..79cd77ce 100644
--- a/configure.ac
+++ b/configure.ac
@@ -289,7 +289,7 @@ AC_SUBST([MAIN_LIBS])
 LIBCRYSTFEL_LIBS="$LIBS $HDF5_LIBS $GSL_LIBS $FFTW_LIBS $LDFLAGS"
 AC_SUBST([LIBCRYSTFEL_LIBS])
 
-GTK_DOC_CHECK([1.11],[--flavour no-tmpl])
+GTK_DOC_CHECK([1.9],[--flavour no-tmpl])
 AC_CONFIG_MACRO_DIR(m4)
 
 HTML_DIR=${docdir}/reference
-- 
cgit v1.2.3