r19672: Make LIBSAMBA-UTIL a subsystem again for now because it has interdependencies

with LIBSAMBA-CONFIG.

diff --git a/source/lib/charset/config.mk b/source/lib/charset/config.mk
index 67703fbc37ef5944907920a8dc7fb04ca1839ef6..4f0c80c79d1b3f98bac1333538f4514fb1b1f3fe 100644 (file)
--- a/source/lib/charset/config.mk
+++ b/source/lib/charset/config.mk
@@ -8,5 +8,6 @@ OBJ_FILES = \
 PUBLIC_HEADERS = charset.h
 PUBLIC_PROTO_HEADER = charset_proto.h
 PUBLIC_DEPENDENCIES = ICONV
+PRIVATE_DEPENDENCIES = DYNCONFIG
 # End SUBSYSTEM CHARSET
 ################################################

diff --git a/source/lib/charset/util_unistr.c b/source/lib/charset/util_unistr.c
index e6d929b4e585c40bf1062f88667d90f2d7578fd0..7e1b08ca3e93846f2ccc09ac01bcb39ddd2843b8 100644 (file)
--- a/source/lib/charset/util_unistr.c
+++ b/source/lib/charset/util_unistr.c
@@ -21,6 +21,7 @@
 
 #include "includes.h"
 #include "system/locale.h"
+#include "dynconfig.h"
 
 /**
  * @file
@@ -44,8 +45,8 @@ static void load_case_tables(void)
        if (!mem_ctx) {
                smb_panic("No memory for case_tables");
        }
-       upcase_table = map_file(data_path(mem_ctx, "upcase.dat"), 0x20000);
-       lowcase_table = map_file(data_path(mem_ctx, "lowcase.dat"), 0x20000);
+       upcase_table = map_file(talloc_asprintf(mem_ctx, "%s/upcase.dat", dyn_DATADIR), 0x20000);
+       lowcase_table = map_file(talloc_asprintf(mem_ctx, "%s/lowcase.dat", dyn_DATADIR), 0x20000);
        talloc_free(mem_ctx);
        if (upcase_table == NULL) {
                /* try also under codepages for testing purposes */

diff --git a/source/lib/util/config.mk b/source/lib/util/config.mk
index 4f3a17d50527422e89ec9dd8502604191ab3cee4..cda42c105a1bfe5f06c4ec8bd8f56e9c756faaa8 100644 (file)
--- a/source/lib/util/config.mk
+++ b/source/lib/util/config.mk
@@ -1,7 +1,7 @@
-[LIBRARY::LIBSAMBA-UTIL]
-VERSION = 0.0.1
-SO_VERSION = 0
-DESCRIPTION = Generic utility functions
+[SUBSYSTEM::LIBSAMBA-UTIL]
+#VERSION = 0.0.1
+#SO_VERSION = 0
+#DESCRIPTION = Generic utility functions
 PUBLIC_PROTO_HEADER = util_proto.h
 PUBLIC_HEADERS = util.h \
                                 byteorder.h \