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

diff --git a/ucw/default.cfg b/ucw/default.cfg
index a85b7768..bc4d48b0 100644
--- a/ucw/default.cfg
+++ b/ucw/default.cfg
@@ -1,13 +1,20 @@
 # Configuration variables of the UCW library and their default values
-# (c) 2005--2012 Martin Mares <mj@ucw.cz>
+# (c) 2005--2014 Martin Mares <mj@ucw.cz>
 
 # Version of the whole package
-Set("UCW_VERSION" => "5.0-dev");
-Set("UCW_VERSION_CODE" => 5000000);
+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");
 
@@ -17,10 +24,6 @@ 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_UCW_OWN_GETOPT");
@@ -43,6 +46,9 @@ 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("CONFIG_UCW_DEFAULT_CONFIG");
 
@@ -69,5 +75,8 @@ 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;