The separate library distribution now compiles.

diff --git a/free/libs/Makefile b/free/libs/Makefile
index 07745f67694da652d991689643e714346b9f4be1..b283efc4906759dd3bcada57538175b0ed4e7e0d 100644 (file)
--- a/free/libs/Makefile
+++ b/free/libs/Makefile
@@ -2,7 +2,7 @@
 # (c) 2007 Martin Mares <mj@ucw.cz>
 
 # The default target
-all: runtree libs
+all: runtree libs api programs extras configs
 
 # Include configuration
 s=.
@@ -13,6 +13,9 @@ obj/config.mk:
 # We will use the libucw build system
 include $(s)/build/Maketop
 
+# Install config files
+CONFIGS+=sherlock local
+
 # Set up names of common libraries (to avoid forward references in rules)
 LIBLANG=$(o)/lang/liblang.pc
 LIBCHARSET=$(o)/charset/libcharset.pc

diff --git a/free/libs/configure b/free/libs/configure
index 0313d745fcf62a143a02c25d40657965886c1f6e..769eaac67c35aa5ca4ba9ac34be1b2a1d714a53d 100755 (executable)
--- a/free/libs/configure
+++ b/free/libs/configure
@@ -22,7 +22,8 @@ BEGIN {
 }
 
 Init($srcdir, "defconfig");    ## FIXME: Shouldn't we use default.cfg everywhere?
-Include "sherlock/default.cfg";
+# FIXME!
+Set("SHERLOCK_VERSION" => "0.0");
 Log "### Configuring Sherlock Libraries " . Get("SHERLOCK_VERSION") . " with configuration " . Get("CONFIG") . "\n";
 Include Get("CONFIG");
 Include "lib/autoconf.cfg";

diff --git a/free/libs/defconfig b/free/libs/defconfig
index 24d9eb75e650b885df2bd132996d11f5053f582d..9a9de22f3e2470a9cf57c7974afd512d4e1f75e5 100644 (file)
--- a/free/libs/defconfig
+++ b/free/libs/defconfig
@@ -1,13 +1,22 @@
-# Default configuration of Sherlock libraries
+# Default configuration of Sherlock libraries (see sherlock/default.cfg for an explanation)
 
-# Version string used by all Sherlock libraries
-# FIXME!
-Set("SHERLOCK_VERSION" => "0.0");
+# Do we want shared or static libraries?
+Set("CONFIG_SHARED");
 
-UnSet("CONFIG_LARGE_FILES");
+# We want the public API
+Set("CONFIG_INSTALL_API");
 
-# We want to build all libraries shared
-Set("CONFIG_SHARED");
+# Libucw should support files >2GB and threading
+Set("CONFIG_LARGE_FILES");
+Set("CONFIG_UCW_THREADS" => 1);
+
+# Libucw extensions
+Set("CONFIG_UCW_PERL" => 1);
+Set("CONFIG_UCW_PERL_MODULES" => 1);
+Set("CONFIG_UCW_SHELL_UTILS" => 1);
+
+# Libsh settings
+Set("CONFIG_BUCKET_SHIFT" => 6);
 
 # Liblang settings
 Set("CONFIG_LANG");
@@ -21,11 +30,5 @@ Set("CONFIG_IMAGES_LIBUNGIF");
 UnSet("CONFIG_IMAGES_LIBGIF");
 UnSet("CONFIG_IMAGES_LIBMAGICK");
 
-# We want the public API
-Set("CONFIG_INSTALL_API");
-
-# FIXME
-Set("DEFAULT_CONFIG" => "cf/library");
-
 # Return success
 1;