Changed default configuration to include LibUCW and utils only

The debug configuration however enables everything.

diff --git a/debug/default.cfg b/debug/default.cfg
index 267212a54674e2087b8f9db3c86c9e5a50595f69..cca794ec80813fac8eec515409369bd523f1efad 100644 (file)
--- a/debug/default.cfg
+++ b/debug/default.cfg
@@ -1,7 +1,12 @@
 # Configuration used for debugging LibUCW
 
 Include("default.cfg");
+
 Set("CONFIG_LOCAL");
 UnSet("CONFIG_SHARED");
 Set("CONFIG_DEBUG");
 Set("CONFIG_EXACT_CPU");
+
+Set("CONFIG_IMAGES");
+Set("CONFIG_CHARSET");
+Set("CONFIG_SHXML");

diff --git a/default.cfg b/default.cfg
index 1b387ca6de0593f3040b23cec39ba2b32852f492..0b05139eebf657a7ab93695b1b4b7bd14a88520b 100644 (file)
--- a/default.cfg
+++ b/default.cfg
@@ -15,30 +15,28 @@ 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");
-}
+Set("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
+UnSet("CONFIG_IMAGES");
+Set("CONFIG_IMAGES_LIBJPEG");
+Set("CONFIG_IMAGES_LIBPNG");
+Set("CONFIG_IMAGES_LIBUNGIF");
+UnSet("CONFIG_IMAGES_LIBGIF");
+UnSet("CONFIG_IMAGES_LIBMAGICK");
+
+# Libcharset
+UnSet("CONFIG_CHARSET");
+Set("CONFIG_CHARSET_UTILS");
+
+# Libshxml
+UnSet("CONFIG_SHXML");
 
 # Return success
 1;