From 8afc271e2a9950fda68e99928746623093cbd6ac Mon Sep 17 00:00:00 2001 From: Andrew Bartlett Date: Fri, 18 Feb 2011 10:24:58 +1100 Subject: lib/util/charset Use top level iconv.c in source3 The two files were very similar already, the only change required was to adopt the s3 module registration fucntion name. (NTSTATUS wasn't used as the charset code does not otherwise use that type). Andrew Bartlett Signed-off-by: Andrew Tridgell --- source3/wscript_build | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'source3/wscript_build') diff --git a/source3/wscript_build b/source3/wscript_build index 7152273ee3..762ef9ee77 100644 --- a/source3/wscript_build +++ b/source3/wscript_build @@ -989,8 +989,8 @@ bld.SAMBA3_SUBSYSTEM('tdb-wrap', vars=locals()) bld.SAMBA3_SUBSYSTEM('CHARSET', - source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c lib/iconv.c''', - public_deps='iconv CODEPOINTS', + source='''lib/util_str.c lib/util_unistr.c lib/charcnv.c''', + public_deps='ICONV_WRAPPER CODEPOINTS', deps='DYNCONFIG') bld.SAMBA3_SUBSYSTEM('samba-util', -- cgit