[glom] Honor --disable-documentation configure option

[Daniel Elstner <daniel src gnome org>]

commit 1d3f71e5c72d23777c64389e3baf1e99326ff543
Author: Daniel Elstner <danielk openismus com>
Date:   Mon May 10 12:34:16 2010 +0200

    Honor --disable-documentation configure option
    
    * Makefile.am (gnome_doc_subdirs): Rename from $(doc_subdirs).
    (doc_subdirs): Conditionally define to the subdirectories of the
    reference documentation, depending on whether ENABLE_DOCUMENTATION
    is true.
    (SUBDIRS): Expand $(doc_subdirs) and $(gnome_doc_subdirs).

 ChangeLog   |   10 ++++++++++
 Makefile.am |   13 +++++++++----
 2 files changed, 19 insertions(+), 4 deletions(-)
---
diff --git a/ChangeLog b/ChangeLog
index 9d367e4..9f5fbee 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,13 @@
+2010-05-10  Daniel Elstner  <danielk openismus com>
+
+	Honor --disable-documentation configure option
+
+	* Makefile.am (gnome_doc_subdirs): Rename from $(doc_subdirs).
+	(doc_subdirs): Conditionally define to the subdirectories of the
+	reference documentation, depending on whether ENABLE_DOCUMENTATION
+	is true.
+	(SUBDIRS): Expand $(doc_subdirs) and $(gnome_doc_subdirs).
+
 2010-05-10  Daniel Borgmann  <danielb openismus com>
 
 	Make Find mode a toggle and move it to the Edit menu.
diff --git a/Makefile.am b/Makefile.am
index db915a4..188bf0b 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-## Copyright (c) 2009  Openismus GmbH  <http://www.openismus.com/>
+## Copyright (c) 2009-2010  Openismus GmbH  <http://www.openismus.com/>
 ##
 ## This file is part of Glom.
 ##
@@ -35,12 +35,17 @@ ACLOCAL_AMFLAGS  = -I macros ${ACLOCAL_FLAGS}
 DISTCHECK_CONFIGURE_FLAGS = --enable-warnings=fatal \
 --disable-scrollkeeper --disable-update-mime-database
 
-if HAVE_GNOME_DOC_UTILS
-doc_subdirs = docs/user-guide
+if ENABLE_DOCUMENTATION
+doc_subdirs = docs/libglom_reference docs/pyglom_reference
 else
 doc_subdirs =
 endif
-SUBDIRS = po $(doc_subdirs) docs/libglom_reference docs/pyglom_reference
+if HAVE_GNOME_DOC_UTILS
+gnome_doc_subdirs = docs/user-guide
+else
+gnome_doc_subdirs =
+endif
+SUBDIRS = po $(doc_subdirs) $(gnome_doc_subdirs)
 
 if HOST_WIN32
 win_resfile = glom/glom.res