From 005ac1efa32c7e3a3dc5eb959b69fdee5fb91320 Mon Sep 17 00:00:00 2001 From: Matthew Barnes Date: Mon, 28 May 2012 12:36:37 -0400 Subject: 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. --- data/Makefile.am | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) (limited to 'data') diff --git a/data/Makefile.am b/data/Makefile.am index 9d9a8869c4..ea2ca3f6a4 100644 --- a/data/Makefile.am +++ b/data/Makefile.am @@ -1,7 +1,11 @@ SUBDIRS = icons +if WITH_CAPPLET +evolution_settings_desktop_in = evolution-settings.desktop.in +endif + desktopdir = $(datadir)/applications -desktop_in_files = evolution.desktop.in evolution-settings.desktop.in +desktop_in_files = evolution.desktop.in $(evolution_settings_desktop_in) desktop_DATA = $(desktop_in_files:.desktop.in=.desktop) autostartdir = $(sysconfdir)/xdg/autostart -- cgit v1.2.3