X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=ucw%2Fdefault.cfg;h=60e1c046b8e698b717220a98dfe353b2a6fd4ef9;hb=7cc9c555b0ef228f93a9f06b7c4b126b05688f79;hp=b71a54940f13c3a6de44e7c3f31f939cc8ae9b0b;hpb=40e9285259a3311feaffa3fa654f91b731684036;p=libucw.git

diff --git a/ucw/default.cfg b/ucw/default.cfg
index b71a5494..60e1c046 100644
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -1,11 +1,9 @@
 # Configuration variables of the UCW library and their default values
-# (c) 2005--2009 Martin Mares <mj@ucw.cz>
+# (c) 2005--2012 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("SHERLOCK_VERSION" => "4.0");
-Set("SHERLOCK_VERSION_CODE" => 4000000);
-Set("UCW_VERSION" => Get("SHERLOCK_VERSION"));
-Set("UCW_VERSION_CODE" => Get("SHERLOCK_VERSION_CODE"));
+Set("UCW_VERSION" => "5.0-dev");
+Set("UCW_VERSION_CODE" => 5000000);
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");
@@ -14,14 +12,18 @@ UnSet("CONFIG_DEBUG");
 UnSet("CONFIG_EXACT_CPU");
 
 # Support files >2GB
-Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_LARGE_FILES");
 
 # Use shared libraries
 UnSet("CONFIG_SHARED");
 
+# In addition to normal static libraries, generate also static libraries
+# with PIC code (libucw-pic.a and friends).
+UnSet("CONFIG_STATIC_PIC");
+
 # 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");
+UnSet("CONFIG_UCW_OWN_GETOPT");
 
 # Install libraries and their API includes
 UnSet("CONFIG_INSTALL_API");
@@ -41,18 +43,34 @@ Set("CONFIG_UCW_SHELL_UTILS" => 1);
 # Include utilities
 Set("CONFIG_UCW_UTILS" => 1);
 
+# Include obsolete daemon-helper utility
+UnSet("CONFIG_UCW_OBSOLETE_DAEMON_HELPER");
+
 # Default configuration file
-UnSet("DEFAULT_CONFIG");
+UnSet("CONFIG_UCW_DEFAULT_CONFIG");
 
 # Environment variable with configuration file
-UnSet("ENV_VAR_CONFIG");
-
-# Use obsolete URL escaping rules (if you need behavior identical to the older versions of libucw)
-UnSet("CONFIG_URL_ESCAPE_COMPAT");
+UnSet("CONFIG_UCW_ENV_VAR_CONFIG");
 
 # Allow use of direct IO on files
-Set("CONFIG_DIRECT_IO");
+Set("CONFIG_UCW_DIRECT_IO");
 Set("CONFIG_UCW_FB_DIRECT");
 
+# Use thread-local storage (needs GCC-support, default: auto-detect)
+# Set("CONFIG_UCW_TLS");
+
+# Use epoll (needs support in libc and kernel, default: auto-detect)
+# Set("CONFIG_UCW_EPOLL");
+
+# Use monotonic clock (default: yes on Linux, no elsewhere)
+# Set("CONFIG_UCW_MONOTONIC_CLOCK");
+
+# Which regular expression library should be used? If none is selected, we use BSD regex from libc.
+UnSet("CONFIG_UCW_POSIX_REGEX");
+UnSet("CONFIG_UCW_PCRE");
+
+# Compile tools used for debugging and testing of LibUCW
+UnSet("CONFIG_UCW_DEBUG_TOOLS");
+
 # Return success
 1;