[gnome-desktop/gnome-2-32] [build] Add a --disable-desktop-docs configure flag

[Vincent Untz <vuntz src gnome org>]

commit 926e0109aded6868a46966afef686f4f11a490c3
Author: Vincent Untz <vuntz gnome org>
Date:   Wed Sep 8 15:25:29 2010 +0200

    [build] Add a --disable-desktop-docs configure flag
    
    This is similar to --disable-gnome-about, and helps installing both
    gnome-desktop and gnome-desktop-3 in parallel.

 Makefile.am  |    4 +++-
 configure.in |    9 +++++++--
 2 files changed, 10 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 232752a..edc61e4 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -4,13 +4,15 @@ SUBDIRS =			\
 	po 			\
 	libgnome-desktop 	\
 	pixmaps			\
-	desktop-docs		\
 	docs			\
 	man
 
 if GNOME_ABOUT_ENABLED
 SUBDIRS += gnome-about
 endif
+if DESKTOP_DOCS_ENABLED
+SUBDIRS += desktop-docs
+endif
 
 EXTRA_DIST =			\
 	MAINTAINERS		\
diff --git a/configure.in b/configure.in
index 8061f36..fef4865 100644
--- a/configure.in
+++ b/configure.in
@@ -91,12 +91,16 @@ if test "$enable_deprecations" = "no"; then
 	AC_SUBST([DISABLE_DEPRECATED])
 fi
 
-# Should we build gnome-about? Useful for people who need to build two
-# gnome-desktop using two different versions of GTK+
+# Should we build gnome-about or the shared desktop docs? Useful for people who
+# need to build two gnome-desktop using two different versions of GTK+
 AC_ARG_ENABLE([gnome-about],
 	[AS_HELP_STRING([--disable-gnome-about],[don't build gnome-about])],
 	[],[enable_gnome_about=yes])
 AM_CONDITIONAL(GNOME_ABOUT_ENABLED, test "x$enable_gnome_about" = "xyes")
+AC_ARG_ENABLE([desktop-docs],
+	[AS_HELP_STRING([--disable-desktop-docs],[don't build desktop-wide help documents])],
+	[],[enable_desktop_docs=yes])
+AM_CONDITIONAL(DESKTOP_DOCS_ENABLED, test "x$enable_desktop_docs" = "xyes")
 
 # Path to the pnp.ids file -- to know if we use one shipped with another
 # package, or an internal file
@@ -269,6 +273,7 @@ echo "
 
         GNOME Distributor:            ${GNOME_DISTRIBUTOR}
         Build gnome-about:            ${enable_gnome_about}
+        Build desktop-wide docs:      ${enable_desktop_docs}
         Date in gnome-version.xml:    ${enable_date_in_gnome_version}
         Use external pnp.ids:         ${EXTERNAL_PNP_IDS}
         Startup notification support: ${have_startup_notification}