X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;ds=sidebyside;f=ucw%2Fdefault.cfg;h=bc4d48b0d357806419d7db343a82264556961ef6;hb=1e5ae8a779b693d8023ce9821b839f29e210d9e8;hp=033b32da921c2a1494a44c73598727e180017366;hpb=9ac4d2ad3fedb39d25d065a14667c183f9da7cae;p=libucw.git

diff --git a/ucw/default.cfg b/ucw/default.cfg
index 033b32da..bc4d48b0 100644
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -1,27 +1,32 @@
 # Configuration variables of the UCW library and their default values
-# (c) 2005--2009 Martin Mares <mj@ucw.cz>
+# (c) 2005--2014 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("SHERLOCK_VERSION" => "3.99.2");
-Set("SHERLOCK_VERSION_CODE" => 3099002);
-Set("UCW_VERSION" => Get("SHERLOCK_VERSION"));
-Set("UCW_VERSION_CODE" => Get("SHERLOCK_VERSION_CODE"));
+Set("UCW_VERSION" => "6.0-dev");
+Set("UCW_VERSION_CODE" => 6000000);
+
+# Name of libraries in packages (libucw$UCW_ABI_SUFFIX.so.0.0, etc.)
+Set("UCW_ABI_SUFFIX" => "-6.0");
 
 # Compile everything with debug information and ASSERT's
 UnSet("CONFIG_DEBUG");
 
+# Environment variable with a switch to abort() on die().
+# Any non-empty value of the variable turns this feature on.
+Set("CONFIG_UCW_ENV_VAR_DIE_BY_ABORT" => "UCW_DIE_BY_ABORT");
+
 # Enable aggressive optimizations depending on exact CPU type (don't use for portable packages)
 UnSet("CONFIG_EXACT_CPU");
 
 # Support files >2GB
-Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_LARGE_FILES");
 
 # Use shared libraries
 UnSet("CONFIG_SHARED");
 
 # 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 +46,37 @@ Set("CONFIG_UCW_SHELL_UTILS" => 1);
 # Include utilities
 Set("CONFIG_UCW_UTILS" => 1);
 
+# Include obsolete ucw-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");
+
+# Clean up library ABI by attaching "ucw_" prefix to all externally visible symbols
+Set("CONFIG_UCW_CLEAN_ABI" => 1);
+
 # Return success
 1;