X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=lib%2Fdefault.cfg;h=3ee543a1c64cf54e591020f2cea5e4c5d04677df;hb=4a3645d50bfa8753f0d3e37d177863452bf824bb;hp=1fbfc52e4eadb2124fc7edd0d222b3f2c32c7ec3;hpb=bb88350f66fcbe7223bcf008d654e6a0df159f9d;p=libucw.git

diff --git a/lib/default.cfg b/lib/default.cfg
index 1fbfc52e..3ee543a1 100644
--- a/lib/default.cfg
+++ b/lib/default.cfg
@@ -2,7 +2,7 @@
 # (c) 2005--2007 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("SHERLOCK_VERSION" => "3.12");
+Set("SHERLOCK_VERSION" => "3.12.4-dev");
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");
@@ -16,11 +16,6 @@ Set("CONFIG_LARGE_FILES");
 # Use shared libraries
 UnSet("CONFIG_SHARED");
 
-# 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");
-
 # If your system can't reset getopt with 'optind = 0', you need to compile our internal copy
 # of GNU libc's getopt. This should not be necessary on GNU libc.
 UnSet("CONFIG_OWN_GETOPT");
@@ -39,3 +34,12 @@ UnSet("CONFIG_UCW_PERL_MODULES");
 
 # Include support utilities for shell scripts
 Set("CONFIG_UCW_SHELL_UTILS" => 1);
+
+# Default configuration file
+UnSet("DEFAULT_CONFIG");
+
+# Environment variable with configuration file
+UnSet("ENV_VAR_CONFIG");
+
+# Return success
+1;