Configure libucw according to Sherlock config.

diff --git a/lib/Makefile b/lib/Makefile
index 3b41f8c1216ea39a7c9e42784ffe6bfd094cfa3f..1ae62a684b02196c22fe4276c14069a5ee8d4aa0 100644 (file)
--- a/lib/Makefile
+++ b/lib/Makefile
@@ -1,7 +1,10 @@
 # Makefile for the UCW Library (c) 1997--2004 Martin Mares <mj@ucw.cz>
 
 DIRS+=lib
+
+ifdef CONFIG_UCW_DBTOOL
 PROGS+=obj/lib/db-tool
+endif
 
 LIBUCW_MODS= \
        alloc alloc_str realloc mempool mempool-str \

diff --git a/lib/perl/Makefile b/lib/perl/Makefile
index 3ddce8731ef9fc255c018c0cbe65ddce93576671..8b23992fe2af66b41e8eeb357734a581a5fa7f19 100644 (file)
--- a/lib/perl/Makefile
+++ b/lib/perl/Makefile
@@ -3,6 +3,6 @@
 DIRS+=lib/perl
 PROGS+=$(addprefix obj/lib/perl/,Config.pm)
 
-ifdef CONFIG_WATSON
+ifdef CONFIG_UCW_PERL_ULIMIT
 include lib/perl/Ulimit/Makefile
 endif