From 153349788cc643135b347eec80620ce958877f4b Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Sun, 12 Nov 2006 00:54:43 +0000
Subject: r19672: Make LIBSAMBA-UTIL a subsystem again for now because it has
 interdependencies with LIBSAMBA-CONFIG. (This used to be commit
 4a044fb529075044755a0b5cc21446bf24bec72e)

---
 source4/lib/charset/config.mk     | 1 +
 source4/lib/charset/util_unistr.c | 5 +++--
 source4/lib/util/config.mk        | 8 ++++----
 3 files changed, 8 insertions(+), 6 deletions(-)

(limited to 'source4/lib')

diff --git a/source4/lib/charset/config.mk b/source4/lib/charset/config.mk
index 67703fbc37..4f0c80c79d 100644
--- a/source4/lib/charset/config.mk
+++ b/source4/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/source4/lib/charset/util_unistr.c b/source4/lib/charset/util_unistr.c
index e6d929b4e5..7e1b08ca3e 100644
--- a/source4/lib/charset/util_unistr.c
+++ b/source4/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/source4/lib/util/config.mk b/source4/lib/util/config.mk
index 4f3a17d505..cda42c105a 100644
--- a/source4/lib/util/config.mk
+++ b/source4/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 \
-- 
cgit