init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_LINUX_XFS_SGID'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_LINUX_XFS_SGID'))
+
+
+
+CHARSET_WEIRD_SRC = 'weird.c'
+CHARSET_CP850_SRC = 'CP850.c'
+CHARSET_CP437_SRC = 'CP437.c'
+CHARSET_MACOSXFS_SRC = 'charset_macosxfs.c'
+
+
+bld.SAMBA_SUBSYSTEM('CHARSET',
+ source='',
+ deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
+ vars=locals())
+
+bld.SAMBA_MODULE('CHARSET_WEIRD',
+ subsystem='CHARSET',
+ source=CHARSET_WEIRD_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_WEIRD'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_WEIRD'))
+
+bld.SAMBA_MODULE('CHARSET_CP850',
+ subsystem='CHARSET',
+ source=CHARSET_CP850_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP850'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP850'))
+
+bld.SAMBA_MODULE('CHARSET_CP437',
+ subsystem='CHARSET',
+ source=CHARSET_CP437_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_CP437'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_CP437'))
+
+bld.SAMBA_MODULE('CHARSET_MACOSXFS',
+ subsystem='CHARSET',
+ source=CHARSET_MACOSXFS_SRC,
+ init_function='',
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('CHARSET_MACOSXFS'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('CHARSET_MACOSXFS'))
lib/sessionid_tdb.c
lib/module.c lib/events.c ${LIBTEVENT_SRC0}
lib/server_contexts.c
- lib/ldap_escape.c ${CHARSET_STATIC}
+ lib/ldap_escape.c
lib/secdesc.c lib/util_seaccess.c ../libcli/security/secace.c
../libcli/security/sddl.c
../libcli/security/secacl.c ${PTHREADPOOL_SRC}
lib/util_nscd.c lib/winbind_util.c ${SERVER_MUTEX_SRC}'''
#FIXME: lib/winbind_util.c probably is not part of PASSDB_SRC
-CHARSET_STATIC = ''
-CHARSET_WEIRD_SRC = 'modules/weird.c'
-CHARSET_CP850_SRC = 'modules/CP850.c'
-CHARSET_CP437_SRC = 'modules/CP437.c'
-CHARSET_MACOSXFS_SRC = 'modules/charset_macosxfs.c'
-
GROUPDB_SRC = '''groupdb/mapping.c groupdb/mapping_tdb.c'''
PROFILE_SRC = '''profile/profile.c'''
deps='talloc',
local_include=False)
-bld.SAMBA_SUBSYSTEM('CHARSET',
- source='',
- deps='''CHARSET_WEIRD CHARSET_CP850 CHARSET_CP437 CHARSET_MACOSXFS''',
- vars=locals())
-
-bld.SAMBA_MODULE('CHARSET_WEIRD',
- subsystem='CHARSET',
- source=CHARSET_WEIRD_SRC,
- init_function='',
- internal_module=True,
- enabled=True)
-
-bld.SAMBA_MODULE('CHARSET_CP850',
- subsystem='CHARSET',
- source=CHARSET_CP850_SRC,
- init_function='',
- internal_module=True,
- enabled=True)
-
-bld.SAMBA_MODULE('CHARSET_CP437',
- subsystem='CHARSET',
- source=CHARSET_CP437_SRC,
- init_function='',
- internal_module=True,
- enabled=True)
-
-bld.SAMBA_MODULE('CHARSET_MACOSXFS',
- subsystem='CHARSET',
- source=CHARSET_MACOSXFS_SRC,
- init_function='',
- internal_module=True,
- enabled=False) #fixme
-
bld.SAMBA_SUBSYSTEM('PERFCOUNT',
source='',
deps='''PERFCOUNT_ONEFS PERFCOUNT_TEST''',
bld.SAMBA_SUBSYSTEM('LIBS',
source=LIB_SRC,
- deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY',
+ deps='NSS_WRAPPER iconv LIBCRYPTO LIBNDR NDR_SECURITY CHARSET',
vars=locals())
bld.SAMBA_SUBSYSTEM('LIB_NONSMBD',