svn commit: samba r19672 - in branches/SAMBA_4_0/source/lib:
charset util
jelmer at samba.org
jelmer at samba.org
Sun Nov 12 00:54:44 GMT 2006
Author: jelmer
Date: 2006-11-12 00:54:43 +0000 (Sun, 12 Nov 2006)
New Revision: 19672
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=19672
Log:
Make LIBSAMBA-UTIL a subsystem again for now because it has interdependencies
with LIBSAMBA-CONFIG.
Modified:
branches/SAMBA_4_0/source/lib/charset/config.mk
branches/SAMBA_4_0/source/lib/charset/util_unistr.c
branches/SAMBA_4_0/source/lib/util/config.mk
Changeset:
Modified: branches/SAMBA_4_0/source/lib/charset/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/config.mk 2006-11-11 23:14:58 UTC (rev 19671)
+++ branches/SAMBA_4_0/source/lib/charset/config.mk 2006-11-12 00:54:43 UTC (rev 19672)
@@ -8,5 +8,6 @@
PUBLIC_HEADERS = charset.h
PUBLIC_PROTO_HEADER = charset_proto.h
PUBLIC_DEPENDENCIES = ICONV
+PRIVATE_DEPENDENCIES = DYNCONFIG
# End SUBSYSTEM CHARSET
################################################
Modified: branches/SAMBA_4_0/source/lib/charset/util_unistr.c
===================================================================
--- branches/SAMBA_4_0/source/lib/charset/util_unistr.c 2006-11-11 23:14:58 UTC (rev 19671)
+++ branches/SAMBA_4_0/source/lib/charset/util_unistr.c 2006-11-12 00:54:43 UTC (rev 19672)
@@ -21,6 +21,7 @@
#include "includes.h"
#include "system/locale.h"
+#include "dynconfig.h"
/**
* @file
@@ -44,8 +45,8 @@
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 */
Modified: branches/SAMBA_4_0/source/lib/util/config.mk
===================================================================
--- branches/SAMBA_4_0/source/lib/util/config.mk 2006-11-11 23:14:58 UTC (rev 19671)
+++ branches/SAMBA_4_0/source/lib/util/config.mk 2006-11-12 00:54:43 UTC (rev 19672)
@@ -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 \
More information about the samba-cvs
mailing list