From 2a97a3c705846855ca3b12f408426314c72d37bd Mon Sep 17 00:00:00 2001 From: Martin Mares Date: Tue, 21 Feb 2012 18:27:20 +0100 Subject: [PATCH] Changed default configuration to include LibUCW and utils only The debug configuration however enables everything. --- debug/default.cfg | 5 +++++ default.cfg | 46 ++++++++++++++++++++++------------------------ 2 files changed, 27 insertions(+), 24 deletions(-) diff --git a/debug/default.cfg b/debug/default.cfg index 267212a5..cca794ec 100644 --- 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 1b387ca6..0b05139e 100644 --- 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; -- 2.39.2