Make the settings capplet optional.

The evolution-settings capplet was originally designed for Anjal, it was
used in MeeGo as part of the Express Mode effort, but doesn't really fit
in GNOME 3 nowadays (nor did it really fit in GNOME 2, in my opinion).

Add a --with-capplet configure switch defaulting to 'no'.  The capplet
will eventually be removed unless I see someone actively maintaining it.

2 files changed, 17 insertions, 5 deletions

diff --git a/modules/startup-wizard/Makefile.am b/modules/startup-wizard/Makefile.am
index 1401abae2f..ce86f1c9da 100644
--- a/modules/startup-wizard/Makefile.am
+++ b/modules/startup-wizard/Makefile.am
@@ -11,6 +11,11 @@ module_startup_wizard_la_CPPFLAGS = \
 module_startup_wizard_la_SOURCES = \
 	evolution-startup-wizard.c
 
+if WITH_CAPPLET
+libevolution_mail_settings_la = \
+	$(top_builddir)/capplet/settings/libevolution-mail-settings.la
+endif
+
 module_startup_wizard_la_LIBADD = \
 	$(top_builddir)/e-util/libeutil.la			\
 	$(top_builddir)/shell/libeshell.la			\
@@ -18,9 +23,9 @@ module_startup_wizard_la_LIBADD = \
 	$(top_builddir)/widgets/misc/libemiscwidgets.la		\
 	$(top_builddir)/calendar/gui/libevolution-calendar.la	\
 	$(top_builddir)/mail/libevolution-mail.la		\
-	$(top_builddir)/capplet/settings/libevolution-mail-settings.la \
-	$(top_builddir)/libemail-engine/libemail-engine.la \
-	$(top_builddir)/libemail-utils/libemail-utils.la  \
+	$(top_builddir)/libemail-engine/libemail-engine.la	\
+	$(top_builddir)/libemail-utils/libemail-utils.la	\
+	$(libevolution_mail_settings_la)			\
 	$(EVOLUTION_DATA_SERVER_LIBS)				\
 	$(GNOME_PLATFORM_LIBS)
 
diff --git a/modules/startup-wizard/evolution-startup-wizard.c b/modules/startup-wizard/evolution-startup-wizard.c
index 7dd1c679e8..92d62f52f8 100644
--- a/modules/startup-wizard/evolution-startup-wizard.c
+++ b/modules/startup-wizard/evolution-startup-wizard.c
@@ -33,7 +33,9 @@
 #include <mail/e-mail-backend.h>
 #include <mail/em-account-editor.h>
 
+#ifdef WITH_CAPPLET
 #include <capplet/settings/mail-capplet-shell.h>
+#endif
 
 #include <calendar/gui/calendar-config.h>
 
@@ -527,6 +529,7 @@ startup_wizard_new_assistant (EStartupWizard *extension)
 	return config->window;
 }
 
+#ifdef WITH_CAPPLET
 static GtkWidget *
 startup_wizard_new_capplet (EStartupWizard *extension)
 {
@@ -540,12 +543,13 @@ startup_wizard_new_capplet (EStartupWizard *extension)
 
 	return capplet;
 }
+#endif /* WITH_CAPPLET */
 
 static void
 startup_wizard_run (EStartupWizard *extension)
 {
 	EShell *shell;
-	GtkWidget *window;
+	GtkWidget *window = NULL;
 	EAccountList *account_list;
 	const gchar *startup_view;
 	gboolean express_mode;
@@ -564,9 +568,12 @@ startup_wizard_run (EStartupWizard *extension)
 	if (express_mode && g_strcmp0 (startup_view, "mail") != 0)
 		return;
 
+#ifdef WITH_CAPPLET
 	if (express_mode)
 		window = startup_wizard_new_capplet (extension);
-	else {
+#endif /* WITH_CAPPLET */
+
+	if (window == NULL) {
 		window = startup_wizard_new_assistant (extension);
 		g_signal_connect (
 			window, "delete-event",