Introduced a configuration post-processor sherlock/autoconf.cfg, which

works similarly to lib/autoconf.cfg, but generates settings specific
to Sherlock.

CONFIG_GATHERER and CONFIG_ANALYSER are now automatically decided upon,
but they still can be overridden manually or set by the custom config file.

diff --git a/build/sherlock.cfg b/build/sherlock.cfg
index d1027a7e6a3db9ffe56913cc27620f873f297f30..ee343c340b47e97bb92d29617ade412ee97e2b14 100644 (file)
--- a/build/sherlock.cfg
+++ b/build/sherlock.cfg
@@ -15,10 +15,7 @@ UnSet("CONFIG_EXACT_CPU");
 
 ### Standard modules available in all releases of Sherlock ###
 
-# Gatherer (the gatherer library and some utilities) [FIXME: decide automatically?]
-Set("CONFIG_GATHERER");
-
-# The gatherer daemon (requires CONFIG_GATHERER)
+# The gatherer daemon
 Set("CONFIG_GATHERD");
 
 # Indexer
@@ -33,13 +30,13 @@ UnSet("CONFIG_WATSON");
 #ifndef CONFIG_FREE
 ### These are available in the commercial version only: ###
 
-# The Shepherd daemon (requires CONFIG_GATHERER and CONFIG_SHEPHERD_PROTOCOL)
+# The Shepherd daemon (requires CONFIG_SHEPHERD_PROTOCOL)
 UnSet("CONFIG_SHEPHERD");
 
 # Support for Shepherd protocols everywhere (distributed indexing etc.)
 UnSet("CONFIG_SHEPHERD_PROTOCOL");
 
-# The reaper daemon, used by Shepherd to download the pages (requires CONFIG_GATHERER)
+# The reaper daemon, used by Shepherd to download the pages
 UnSet("CONFIG_REAPD");
 
 # The multiplexer
@@ -155,6 +152,14 @@ Set("MUX_MAX_ROUTE_KEYS" => 4);
 
 #endif
 
+### Features which are decided on automatically (see sherlock/autoconf.cfg), but can be overriden ###
+
+# The gatherer library
+UnSet("CONFIG_GATHERER");
+
+# The analyser library
+UnSet("CONFIG_ANALYSER");
+
 ### These are internal settings which shouldn't be modified by custom configs ###
 
 # Default configuration file