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

[Vincent Untz <vuntz src gnome org>]

commit 4322412806db6078ba80688e533494e5a798a1c6
Author: Vincent Untz <vuntz gnome org>
Date:   Sat Aug 7 17:02:19 2010 +0200

    [build] Add --disable-gnome-about configure flag
    
    This makes it easier to have both gnome-desktop and gnome-desktop-3
    installed at the same time.

 Makefile.am     |    5 ++++-
 configure.in    |    8 ++++++++
 man/Makefile.am |    8 ++++++--
 3 files changed, 18 insertions(+), 3 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 56f3763..edd6e52 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -3,12 +3,15 @@ ACLOCAL_AMFLAGS = -I m4
 SUBDIRS =			\
 	po 			\
 	libgnome-desktop 	\
-	gnome-about 		\
 	pixmaps			\
 	desktop-docs		\
 	docs			\
 	man
 
+if GNOME_ABOUT_ENABLED
+SUBDIRS += gnome-about
+endif
+
 EXTRA_DIST =			\
 	MAINTAINERS		\
 	ChangeLog.pre-git	\
diff --git a/configure.in b/configure.in
index ec6545a..0f9a08e 100644
--- a/configure.in
+++ b/configure.in
@@ -91,6 +91,13 @@ 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+
+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")
+
 # Path to the pnp.ids file -- to know if we use one shipped with another
 # package, or an internal file
 
@@ -261,6 +268,7 @@ echo "
         Warn about deprecations:      ${enable_deprecations}
 
         GNOME Distributor:            ${GNOME_DISTRIBUTOR}
+        Build gnome-about:            ${enable_gnome_about}
         Date in gnome-version.xml:    ${enable_date_in_gnome_version}
         Use external pnp.ids:         ${EXTERNAL_PNP_IDS}
         Startup notification support: ${have_startup_notification}
diff --git a/man/Makefile.am b/man/Makefile.am
index 7d4f825..ab1a0aa 100644
--- a/man/Makefile.am
+++ b/man/Makefile.am
@@ -1,5 +1,9 @@
-man_MANS = gnome-about.1
+man_MANS =
 
-EXTRA_DIST = $(man_MANS)
+if GNOME_ABOUT_ENABLED
+man_MANS += gnome-about.1
+endif
+
+EXTRA_DIST = gnome-about.1
 
 -include $(top_srcdir)/git.mk