Moved the default configuration from build/sherlock.cfg to sherlock/default.cfg,

which is more logical and also allows for easier separation of the libucw
+ the build system from the rest of Sherlock.

diff --git a/build/sherlock.cfg b/build/sherlock.cfg
deleted file mode 100644 (file)
index db28013..0000000
--- a/build/sherlock.cfg
+++ /dev/null
@@ -1,186 +0,0 @@
-# Configuration variables of Sherlock and their default values
-# (c) 2005--2006 Martin Mares <mj@ucw.cz>
-
-# Version of the whole package
-Set("SHERLOCK_VERSION" => "3.9");
-
-# Installation directory for `make install'
-Set("INSTALL_DIR" => "~/run-3.9");
-
-# Compile everything with debug information and ASSERT's
-UnSet("CONFIG_DEBUG");
-
-# Enable aggressive optimizations depending on exact CPU type (don't use for portable packages)
-UnSet("CONFIG_EXACT_CPU");
-
-### Standard modules available in all releases of Sherlock ###
-
-# The gatherer daemon
-Set("CONFIG_GATHERD");
-
-# Indexer
-Set("CONFIG_INDEXER");
-
-# Search server
-Set("CONFIG_SEARCH");
-
-# Watson: The Monitoring System
-UnSet("CONFIG_WATSON");
-
-#ifndef CONFIG_FREE
-### These are available in the commercial version only: ###
-
-# 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
-UnSet("CONFIG_REAPD");
-
-# The multiplexer
-UnSet("CONFIG_MUX");
-
-#endif
-
-### Optional Modules & Features ###
-
-# Support databases >4GB
-Set("CONFIG_LARGE_DB");
-
-# Bucket position alignment shift (maximum bucket file size is 4G << this shift)
-Set("CONFIG_BUCKET_SHIFT" => 7);
-
-# Number of sections we remember limits for
-Set("SHERLOCK_NUM_SECTIONS" => 4);
-
-# Use shared libraries
-UnSet("CONFIG_SHARED");
-
-# Gathering of PDF files
-Set("CONFIG_PDF");
-
-# Searching by last modification time
-Set("CONFIG_LASTMOD");
-
-# Searching by file type
-Set("CONFIG_FILETYPE");
-
-# Language processing (requires CONFIG_FILETYPE)
-Set("CONFIG_LANG");
-
-# Spelling checker
-Set("CONFIG_SPELL");
-
-# Enable indexing of context-dependent words and set maximum number
-# of context slots (undef, 256 or 32768). Lower values save memory, higher time.
-Set("CONFIG_MAX_CONTEXTS" => 256);
-
-# Enable more than 16-bit word positions in references
-Set("CONFIG_32BIT_REFERENCES");
-
-# Debugging tools
-UnSet("CONFIG_DEBUG_TOOLS");
-
-# Search server: Enable EXPLAIN command (slows searching down slightly)
-Set("CONFIG_EXPLAIN");
-
-# Search server: Full support for all types of boolean expressions and ANY.
-# (Otherwise, only expressions with at least one term matched positively are allowed.)
-# It may be slow in some cases - for example `ANY' or `NOT "A"' queries.
-UnSet("CONFIG_ALLOW_ANY");
-
-# If your system doesn't contain GNU libc 2.3 or newer, it's recommended to let Sherlock
-# use its own regex library (a copy of the glibc one), because the default regex library
-# is likely to be crappy.
-Set("CONFIG_OWN_REGEX");
-
-# Include custom builtin functions in filtering language
-UnSet("CONFIG_CUSTOM_FILTER");
-
-# Install libraries and their API includes
-UnSet("CONFIG_INSTALL_API");
-
-#ifndef CONFIG_FREE
-# Number of refresh frequencies we allow
-Set("SHERLOCK_NUM_FREQS" => 5);
-
-# Gathering and indexing split to areas
-UnSet("CONFIG_AREAS");
-
-# Site compression
-UnSet("CONFIG_SITES");
-
-# Generate hashes for merging of independent indices in the mux
-UnSet("CONFIG_MERGING_HASHES");
-
-# Gathering of images
-UnSet("CONFIG_IMAGES");
-
-# Gathering of MS Word files
-UnSet("CONFIG_MSWORD");
-
-# Gathering of MS Excel files
-UnSet("CONFIG_EXCEL");
-
-# Extra stuff for Centrum
-UnSet("CONFIG_CENTRUM");
-UnSet("CONFIG_CENTRUM_CZ");
-UnSet("CONFIG_CENTRUM_SK");
-UnSet("CONFIG_CENTRUM_PL");
-UnSet("CONFIG_CENTRUM_CATALOG");
-
-# Debugging version of Centrum installation (lower limits, trivial filters etc.)
-UnSet("CONFIG_CENTRUM_DEBUG");
-
-# Stemmer by UFAL and its dictionaries
-UnSet("CONFIG_UFAL_STEMMER");
-UnSet("CONFIG_UFAL_DICT_CS");
-UnSet("CONFIG_UFAL_DICT_SK");
-
-# Stemming dictionaries for our own stemmer
-UnSet("CONFIG_CS_STEMMER");
-UnSet("CONFIG_PL_STEMMER");
-
-# Dynamic weights
-UnSet("CONFIG_WEIGHTS");
-
-# Include the incremental indexer
-UnSet("CONFIG_INCREMENTAL");
-
-# Maximum number of search servers, databases per search server and route keys
-Set("MUX_MAX_SERVERS" => 128);
-Set("MUX_MAX_DATABASES_PER_SERVER" => 4);
-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
-Set("DEFAULT_CONFIG" => "cf/sherlock");
-
-# Configuration of parts of the UCW library
-Set("CONFIG_UCW_PERL" => 1);
-Set("CONFIG_UCW_SHELL_UTILS" => 1);
-
-# Configuration of the language library
-Set("CONFIG_LANG_DETECT" => 1);
-
-# We always want to be able to use large files
-Set("CONFIG_LFS" => 1);
-
-# Maximum word length common for Sherlock and liblang, see comments in sherlock/index.h
-Set("MAX_WORD_LEN" => 64);
-
-# Return success
-1;