X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fdefault.cfg;h=4d25df7d5d47b7873acf2381525e1bae01403fee;hb=231c8d9c44578452d943616b343e5387bffcda84;hp=1504f8dfb8c67560deae27fc02def2abf3682b5f;hpb=5f81280e4ec7a5517e94f1c1f53e42fba537fbd8;p=libucw.git

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 1504f8df..4d25df7d 100644
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -1,9 +1,9 @@
 # Configuration variables of the UCW library and their default values
-# (c) 2005--2010 Martin Mares <mj@ucw.cz>
+# (c) 2005--2012 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("UCW_VERSION" => "4.0.1-dev");
-Set("UCW_VERSION_CODE" => 4000001);
+Set("UCW_VERSION" => "5.0-dev");
+Set("UCW_VERSION_CODE" => 5000000);
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");
@@ -12,7 +12,7 @@ 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");
@@ -23,7 +23,7 @@ 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");
@@ -44,16 +44,13 @@ Set("CONFIG_UCW_SHELL_UTILS" => 1);
 Set("CONFIG_UCW_UTILS" => 1);
 
 # 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)
@@ -62,5 +59,12 @@ Set("CONFIG_UCW_FB_DIRECT");
 # 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");
+
 # Return success
 1;