X-Git-Url: http://mj.ucw.cz/gitweb/?a=blobdiff_plain;f=default.cfg;h=086ab385f1902b2b281158af30940e20ba17249b;hb=8ad9729461149b6c7a46c01e2cc305b23c19af9a;hp=1b387ca6de0593f3040b23cec39ba2b32852f492;hpb=f12b8d1c94c06ee84a070b94b72ed2ef780c1268;p=libucw.git

diff --git a/default.cfg b/default.cfg
index 1b387ca6..086ab385 100644
--- a/default.cfg
+++ b/default.cfg
@@ -10,35 +10,40 @@ Set("CONFIG_DEBUG");
 # We want the public API
 Set("CONFIG_INSTALL_API");
 
+# Enable GCC link-time optimizations (experimental)
+UnSet("CONFIG_LTO");
+
 # LibUCW should support files >2GB and threading
 Set("CONFIG_UCW_LARGE_FILES");
 Set("CONFIG_UCW_THREADS" => 1);
 
-# Build only LibUCW itself
-UnSet("CONFIG_UCW_ONLY");
-
-unless (Get("CONFIG_UCW_ONLY")) {
-	# Libucw extensions
-	Set("CONFIG_UCW_PERL" => 1);
-	Set("CONFIG_UCW_PERL_MODULES" => 1);
-	Set("CONFIG_UCW_SHELL_UTILS" => 1);
-	Set("CONFIG_UCW_UTILS" => 1);
-
-	# Libimages settings
-	Set("CONFIG_IMAGES");
-	Set("CONFIG_IMAGES_LIBJPEG");
-	Set("CONFIG_IMAGES_LIBPNG");
-	Set("CONFIG_IMAGES_LIBUNGIF");
-	UnSet("CONFIG_IMAGES_LIBGIF");
-	UnSet("CONFIG_IMAGES_LIBMAGICK");
-
-	# Libcharset
-	Set("CONFIG_CHARSET");
-	Set("CONFIG_CHARSET_UTILS");
-
-	# Libshxml
-	Set("CONFIG_SHXML");
-}
+# Libucw extensions
+Set("CONFIG_UCW_PERL" => 1);
+Set("CONFIG_UCW_PERL_MODULES" => 1);
+Set("CONFIG_UCW_SHELL_UTILS" => 1);
+Set("CONFIG_UCW_UTILS" => 1);
+
+# Libucw-images settings
+UnSet("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_LIBJPEG");
+Set("CONFIG_IMAGES_LIBPNG");
+UnSet("CONFIG_IMAGES_LIBUNGIF");
+Set("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Libucw-charset
+Set("CONFIG_CHARSET");
+Set("CONFIG_CHARSET_UTILS");
+
+# Libucw-xml
+Set("CONFIG_XML");
+
+# Libucw-json
+Set("CONFIG_JSON");
+
+# Compress .deb packages with gzip (instead of the default algorithm)
+# Hack for Economia's deployment machinery
+UnSet("CONFIG_BUILDDEB_GZIP");
 
 # Return success
 1;