#define _SAMBA_UTIL_H_
#if _SAMBA_BUILD_ == 4
-#include "lib/charset/charset.h"
+#include "../lib/util/charset/charset.h"
#endif
#include "../lib/util/attr.h"
#include <sys/time.h>
#if _SAMBA_BUILD_ == 4
#include "../lib/util/util.h" /* for discard_const */
-#include "lib/charset/charset.h"
+#include "../lib/util/charset/charset.h"
#endif
/*
nsswitchsrcdir := nsswitch
libsrcdir := lib
libsocketsrcdir := lib/socket
-libcharsetsrcdir := lib/charset
+libcharsetsrcdir := ../lib/util/charset
ldb_sambasrcdir := lib/ldb-samba
tdbsrcdir := ../lib/tdb
ldbsrcdir := lib/ldb
m4_include(../lib/util/capability.m4)
m4_include(../lib/util/time.m4)
m4_include(../lib/popt/samba.m4)
-m4_include(lib/charset/config.m4)
+m4_include(../lib/util/charset/config.m4)
m4_include(lib/socket/config.m4)
m4_include(../lib/zlib/zlib.m4)
AC_ZLIB([
#include "librpc/gen_ndr/ndr_drsuapi.h"
#include "lib/ldb/include/ldb.h"
#include "system/time.h"
-#include "lib/charset/charset.h"
+#include "../lib/util/charset/charset.h"
#include "librpc/ndr/libndr.h"
#include "param/param.h"
#define __TDR_H__
#include <talloc.h>
-#include "charset/charset.h"
+#include "../lib/util/charset/charset.h"
#define TDR_BIG_ENDIAN 0x01
#define TDR_ALIGN2 0x02
mkinclude nsswitch/config.mk
mkinclude lib/samba3/config.mk
mkinclude lib/socket/config.mk
-mkinclude lib/charset/config.mk
+mkinclude ../lib/util/charset/config.mk
mkinclude lib/ldb-samba/config.mk
mkinclude lib/tls/config.mk
mkinclude lib/registry/config.mk
#################################
TORTURE_LOCAL_OBJ_FILES = \
- $(torturesrcdir)/../lib/charset/tests/iconv.o \
+ $(torturesrcdir)/../../lib/util/charset/tests/iconv.o \
$(torturesrcdir)/../../lib/talloc/testsuite.o \
$(torturesrcdir)/../../lib/replace/test/getifaddrs.o \
$(torturesrcdir)/../../lib/replace/test/os2_delete.o \
$(torturesrcdir)/../../lib/util/tests/file.o \
$(torturesrcdir)/../../lib/util/tests/genrand.o \
$(torturesrcdir)/../../lib/compression/testsuite.o \
- $(torturesrcdir)/../lib/charset/tests/charset.o \
+ $(torturesrcdir)/../../lib/util/charset/tests/charset.o \
$(torturesrcdir)/../libcli/security/tests/sddl.o \
$(torturesrcdir)/../lib/tdr/testsuite.o \
$(torturesrcdir)/../lib/events/testsuite.o \