[gnome-schedule] GNOME applet disabled by default, with option to enable

[Gaute Hope <gauteh src gnome org>]

commit cce20994bcedfd78ed0c89136b63b98e59389d28
Author: Gaute Hope <eg gaute vetsj com>
Date:   Fri Aug 19 09:37:31 2011 +0200

    GNOME applet disabled by default, with option to enable
    
    GNOME 3 does not support GNOME 2 applets. The applet is now disabled by
    default, but can be enabled by passing --enable-applet to configure
    script.

 Makefile.am         |    7 ++++++-
 NEWS                |    3 +++
 configure.ac        |   17 ++++++++++++++++-
 servers/Makefile.am |    2 ++
 src/Makefile.am     |   17 +++++++++++------
 5 files changed, 38 insertions(+), 8 deletions(-)
---
diff --git a/Makefile.am b/Makefile.am
index 5499a2a..a87096d 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,9 @@
-SUBDIRS = desktop src icons po servers help
+SUBDIRS = desktop src icons po help
+
+if APPLET
+SUBDIRS += servers
+endif
+
 
 intltool_extra = intltool-extract.in intltool-merge.in intltool-update.in
 
diff --git a/NEWS b/NEWS
index e735ef5..9469990 100644
--- a/NEWS
+++ b/NEWS
@@ -1,3 +1,6 @@
+2011-08-19:
+  * Applet disabled by default, not supported by GNOME 3
+
 2011-01-29:
   * Released 2.1.3 - updated translations
 
diff --git a/configure.ac b/configure.ac
index f43a447..42281ff 100644
--- a/configure.ac
+++ b/configure.ac
@@ -101,11 +101,25 @@ if test "$XSLTPROC" = "no"; then
 	AC_MSG_ERROR(xsltproc is required)
 fi
 
+dnl Enable applet, the applet is not compatible with GNOME 3
+dnl and should be explicitily enabled.
+AC_MSG_CHECKING(for whether to include GNOME panel applet..)
+AC_ARG_ENABLE(applet,
+              [  --enable-applet         enable applet for the GNOME panel (GNOME 2 only)],
+              [applet=yes])
+
+AM_CONDITIONAL([APPLET], [test x$applet = xyes])
+
+if test "$applet" = "yes"; then
+  AC_MSG_RESULT(yes)
+else
+  AC_MSG_RESULT(no)
+fi
 
 
 dnl *******************************
 dnl Internationalization
-dnl ******************************* 
+dnl *******************************
 GETTEXT_PACKAGE=gnome-schedule
 AC_DEFINE_UNQUOTED(GETTEXT_PACKAGE, "$GETTEXT_PACKAGE")
 AC_SUBST(GETTEXT_PACKAGE)
@@ -131,3 +145,4 @@ servers/Makefile
 servers/GNOME_GnomeSchedule.server.in
 help/Makefile
 ])
+
diff --git a/servers/Makefile.am b/servers/Makefile.am
index 425aab3..a0b7fdc 100644
--- a/servers/Makefile.am
+++ b/servers/Makefile.am
@@ -6,4 +6,6 @@ server_DATA = $(server_in_files:.server.in=.server)
 
 DISTCLEANFILES = $(server_DATA)
 
+if APPLET
 EXTRA_DIST = $(server_DATA)
+endif
diff --git a/src/Makefile.am b/src/Makefile.am
index 073081e..bc061c6 100644
--- a/src/Makefile.am
+++ b/src/Makefile.am
@@ -14,28 +14,33 @@ gnomeschedule_PYTHON = \
 	addWindow.py \
 	atEditor.py \
 	data.py \
-	scheduleapplet.py \
 	template.py \
 	template_chooser.py \
 	template_manager.py \
 	xwrapper.py
 
+if APPLET
+gnomeschedule_PYTHON += scheduleapplet.py
+endif
 
 uidir = $(datadir)/gnome-schedule
 ui_DATA = \
-	gnome-schedule.glade \
-	gnome-schedule-applet.xml
-	
+	gnome-schedule.glade
+
+if APPLET
+ui_DATA += gnome-schedule-applet.xml
+endif
+
 
 DISTCLEANFILES = \
 	$(bin_SCRIPTS) \
 	config.py \
 	gnome-schedule.glade.bak \
 	gnome-schedule.gladep.bak \
-	gnome-schedule.gladep 
+	gnome-schedule.gladep
 
 EXTRA_DIST =  \
 	$(bin_SCRIPTS) \
 	$(gnomeschedule_PYTHON) \
 	$(ui_DATA)
-	
+