summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGünther Deschner <gd@samba.org>2010-12-01 12:10:03 +0100
committerGünther Deschner <gd@samba.org>2010-12-01 18:39:14 +0100
commit133a2ffd006062c1e55e79a1ed4fb756b182a63c (patch)
tree0754ba967dc0e3ed3a392b2d9da71d43cdeb03ab
parent56290d0b337e2e01b021e98d1252ae604cf5c0f8 (diff)
downloadsamba-133a2ffd006062c1e55e79a1ed4fb756b182a63c.tar.gz
samba-133a2ffd006062c1e55e79a1ed4fb756b182a63c.tar.bz2
samba-133a2ffd006062c1e55e79a1ed4fb756b182a63c.zip
s3-waf: avoid module name uppercasing.
This finally allows mixed case module names like the classic build (./configure --shared_modules=charset_CP850) Guenther Autobuild-User: Günther Deschner <gd@samba.org> Autobuild-Date: Wed Dec 1 18:39:14 CET 2010 on sn-devel-104
-rw-r--r--buildtools/wafsamba/samba3.py4
-rw-r--r--source3/auth/wscript_build36
-rw-r--r--source3/libgpo/gpext/wscript_build12
-rw-r--r--source3/modules/wscript_build212
-rw-r--r--source3/passdb/wscript_build20
-rw-r--r--source3/rpc_server/wscript_build56
-rw-r--r--source3/winbindd/wscript_build64
-rw-r--r--source3/wscript6
8 files changed, 205 insertions, 205 deletions
diff --git a/buildtools/wafsamba/samba3.py b/buildtools/wafsamba/samba3.py
index 9abb2abbec..5008abb949 100644
--- a/buildtools/wafsamba/samba3.py
+++ b/buildtools/wafsamba/samba3.py
@@ -25,14 +25,14 @@ Options.Handler.SAMBA3_ADD_OPTION = SAMBA3_ADD_OPTION
def SAMBA3_IS_STATIC_MODULE(bld, module):
'''Check whether module is in static list'''
- if module.lower() in bld.env['static_modules']:
+ if module in bld.env['static_modules']:
return True
return False
Build.BuildContext.SAMBA3_IS_STATIC_MODULE = SAMBA3_IS_STATIC_MODULE
def SAMBA3_IS_SHARED_MODULE(bld, module):
'''Check whether module is in shared list'''
- if module.lower() in bld.env['shared_modules']:
+ if module in bld.env['shared_modules']:
return True
return False
Build.BuildContext.SAMBA3_IS_SHARED_MODULE = SAMBA3_IS_SHARED_MODULE
diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build
index e740f87766..e9010fffcb 100644
--- a/source3/auth/wscript_build
+++ b/source3/auth/wscript_build
@@ -31,62 +31,62 @@ bld.SAMBA_MODULE('auth_sam',
subsystem='auth',
source=AUTH_SAM_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SAM'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SAM'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam'))
bld.SAMBA_MODULE('auth_unix',
subsystem='auth',
source=AUTH_UNIX_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_UNIX'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_UNIX'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix'))
bld.SAMBA_MODULE('auth_winbind',
subsystem='auth',
source=AUTH_WINBIND_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_WINBIND'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_WINBIND'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind'))
bld.SAMBA_MODULE('auth_wbc',
subsystem='auth',
source=AUTH_WBC_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_WBC'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_WBC'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc'))
bld.SAMBA_MODULE('auth_server',
subsystem='auth',
source=AUTH_SERVER_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SERVER'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SERVER'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server'))
bld.SAMBA_MODULE('auth_domain',
subsystem='auth',
source=AUTH_DOMAIN_SRC,
deps='RPC_CLIENT_SCHANNEL',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_DOMAIN'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_DOMAIN'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_domain'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_domain'))
bld.SAMBA_MODULE('auth_builtin',
subsystem='auth',
source=AUTH_BUILTIN_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_BUILTIN'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_BUILTIN'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin'))
bld.SAMBA_MODULE('auth_netlogond',
subsystem='auth',
source=AUTH_NETLOGOND_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_NETLOGOND'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_NETLOGOND'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_netlogond'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_netlogond'))
bld.SAMBA_MODULE('auth_script',
subsystem='auth',
source=AUTH_SCRIPT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('AUTH_SCRIPT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('AUTH_SCRIPT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_script'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_script'))
diff --git a/source3/libgpo/gpext/wscript_build b/source3/libgpo/gpext/wscript_build
index b35396d021..1f6e8df0fe 100644
--- a/source3/libgpo/gpext/wscript_build
+++ b/source3/libgpo/gpext/wscript_build
@@ -15,19 +15,19 @@ bld.SAMBA_MODULE('gpext_registry',
source=GPEXT_REGISTRY_SRC,
deps='NDR_PREG',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_REGISTRY'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_REGISTRY'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_registry'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_registry'))
bld.SAMBA_MODULE('gpext_scripts',
subsystem='gpext',
source=GPEXT_SCRIPTS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SCRIPTS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_SCRIPTS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_scripts'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_scripts'))
bld.SAMBA_MODULE('gpext_security',
subsystem='gpext',
source=GPEXT_SECURITY_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('GPEXT_SECURITY'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('GPEXT_SECURITY'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('gpext_security'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('gpext_security'))
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index 8b6af85b90..32dfa40f3f 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -67,338 +67,338 @@ bld.SAMBA_MODULE('vfs_default',
subsystem='vfs',
source=VFS_DEFAULT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
bld.SAMBA_MODULE('vfs_audit',
subsystem='vfs',
source=VFS_AUDIT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AUDIT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AUDIT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit'))
bld.SAMBA_MODULE('vfs_extd_audit',
subsystem='vfs',
source=VFS_EXTD_AUDIT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXTD_AUDIT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXTD_AUDIT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit'))
bld.SAMBA_MODULE('vfs_full_audit',
subsystem='vfs',
source=VFS_FULL_AUDIT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FULL_AUDIT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FULL_AUDIT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit'))
bld.SAMBA_MODULE('vfs_fake_perms',
subsystem='vfs',
source=VFS_FAKE_PERMS_SRC,
deps='acl attr',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FAKE_PERMS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FAKE_PERMS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms'))
bld.SAMBA_MODULE('vfs_recycle',
subsystem='vfs',
source=VFS_RECYCLE_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_RECYCLE'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_RECYCLE'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle'))
bld.SAMBA_MODULE('vfs_netatalk',
subsystem='vfs',
source=VFS_NETATALK_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_NETATALK'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_NETATALK'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk'))
bld.SAMBA_MODULE('vfs_default_quota',
subsystem='vfs',
source=VFS_DEFAULT_QUOTA_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DEFAULT_QUOTA'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DEFAULT_QUOTA'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
bld.SAMBA_MODULE('vfs_readonly',
subsystem='vfs',
source=VFS_READONLY_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READONLY'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READONLY'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
bld.SAMBA_MODULE('vfs_cap',
subsystem='vfs',
source=VFS_CAP_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CAP'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CAP'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cap'))
bld.SAMBA_MODULE('vfs_expand_msdfs',
subsystem='vfs',
source=VFS_EXPAND_MSDFS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_EXPAND_MSDFS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_EXPAND_MSDFS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_expand_msdfs'))
bld.SAMBA_MODULE('vfs_shadow_copy',
subsystem='vfs',
source=VFS_SHADOW_COPY_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy'))
bld.SAMBA_MODULE('vfs_shadow_copy2',
subsystem='vfs',
source=VFS_SHADOW_COPY2_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SHADOW_COPY2'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SHADOW_COPY2'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy2'))
bld.SAMBA_MODULE('vfs_afsacl',
subsystem='vfs',
source=VFS_AFSACL_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AFSACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AFSACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_afsacl'))
bld.SAMBA_MODULE('vfs_xattr_tdb',
subsystem='vfs',
source=VFS_XATTR_TDB_SRC,
deps='NDR_XATTR',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_XATTR_TDB'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_XATTR_TDB'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_xattr_tdb'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_xattr_tdb'))
bld.SAMBA_MODULE('vfs_posixacl',
subsystem='vfs',
source=VFS_POSIXACL_SRC,
deps='acl attr',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_POSIXACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_POSIXACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_posixacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_posixacl'))
bld.SAMBA_MODULE('vfs_aixacl',
subsystem='vfs',
source=VFS_AIXACL_SRC,
deps='VFS_AIXACL_UTIL',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl'))
bld.SAMBA_MODULE('vfs_aixacl2',
subsystem='vfs',
source=VFS_AIXACL2_SRC,
deps='NFS4_ACLS VFS_AIXACL_UTIL',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIXACL2'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIXACL2'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aixacl2'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aixacl2'))
bld.SAMBA_MODULE('vfs_solarisacl',
subsystem='vfs',
source=VFS_SOLARISACL_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SOLARISACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SOLARISACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_solarisacl'))
bld.SAMBA_MODULE('vfs_zfsacl',
subsystem='vfs',
source=VFS_ZFSACL_SRC,
deps='NFS4_ACLS',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ZFSACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ZFSACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_zfsacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_zfsacl'))
bld.SAMBA_MODULE('vfs_hpuxacl',
subsystem='vfs',
source=VFS_HPUXACL_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_HPUXACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_HPUXACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_hpuxacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_hpuxacl'))
bld.SAMBA_MODULE('vfs_irixacl',
subsystem='vfs',
source=VFS_IRIXACL_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_IRIXACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_IRIXACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_irixacl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_irixacl'))
bld.SAMBA_MODULE('vfs_tru64acl',
subsystem='vfs',
source=VFS_TRU64ACL_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TRUE64ACL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TRUE64ACL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_true64acl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_true64acl'))
bld.SAMBA_MODULE('vfs_catia',
subsystem='vfs',
source=VFS_CATIA_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CATIA'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CATIA'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia'))
bld.SAMBA_MODULE('vfs_streams_xattr',
subsystem='vfs',
source=VFS_STREAMS_XATTR_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_XATTR'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_XATTR'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr'))
bld.SAMBA_MODULE('vfs_streams_depot',
subsystem='vfs',
source=VFS_STREAMS_DEPOT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_STREAMS_DEPOT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_STREAMS_DEPOT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_depot'))
bld.SAMBA_MODULE('vfs_cacheprime',
subsystem='vfs',
source=VFS_CACHEPRIME_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CACHEPRIME'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CACHEPRIME'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cacheprime'))
bld.SAMBA_MODULE('vfs_prealloc',
subsystem='vfs',
source=VFS_PREALLOC_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREALLOC'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREALLOC'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_prealloc'))
bld.SAMBA_MODULE('vfs_commit',
subsystem='vfs',
source=VFS_COMMIT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_COMMIT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_COMMIT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_commit'))
bld.SAMBA_MODULE('vfs_gpfs',
subsystem='vfs',
source=VFS_GPFS_SRC,
deps='NFS4_ACLS',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_GPFS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_GPFS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_gpfs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_gpfs'))
bld.SAMBA_MODULE('vfs_notify_fam',
subsystem='vfs',
source=VFS_NOTIFY_FAM_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_NOTIFY_FAM'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_NOTIFY_FAM'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_notify_fam'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_notify_fam'))
bld.SAMBA_MODULE('vfs_readahead',
subsystem='vfs',
source=VFS_READAHEAD_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_READAHEAD'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_READAHEAD'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readahead'))
bld.SAMBA_MODULE('vfs_tsmsm',
subsystem='vfs',
source=VFS_TSMSM_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TSMSM'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TSMSM'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_tsmsm'))
bld.SAMBA_MODULE('vfs_fileid',
subsystem='vfs',
source=VFS_FILEID_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_FILEID'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_FILEID'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fileid'))
bld.SAMBA_MODULE('vfs_aio_fork',
subsystem='vfs',
source=VFS_AIO_FORK_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_AIO_FORK'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_AIO_FORK'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
bld.SAMBA_MODULE('vfs_preopen',
subsystem='vfs',
source=VFS_PREOPEN_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_PREOPEN'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_PREOPEN'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_preopen'))
bld.SAMBA_MODULE('vfs_syncops',
subsystem='vfs',
source=VFS_SYNCOPS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SYNCOPS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SYNCOPS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_syncops'))
bld.SAMBA_MODULE('vfs_acl_xattr',
subsystem='vfs',
source=VFS_ACL_XATTR_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_XATTR'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_XATTR'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr'))
bld.SAMBA_MODULE('vfs_acl_tdb',
subsystem='vfs',
source=VFS_ACL_TDB_SRC,
deps='NDR_XATTR',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ACL_TDB'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ACL_TDB'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_tdb'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_tdb'))
bld.SAMBA_MODULE('vfs_smb_traffic_analyzer',
subsystem='vfs',
source=VFS_SMB_TRAFFIC_ANALYZER_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SMB_TRAFFIC_ANALYZER'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SMB_TRAFFIC_ANALYZER'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_smb_traffic_analyzer'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_smb_traffic_analyzer'))
bld.SAMBA_MODULE('vfs_onefs',
subsystem='vfs',
source=VFS_ONEFS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ONEFS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ONEFS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs'))
bld.SAMBA_MODULE('vfs_onefs_shadow_copy',
subsystem='vfs',
source=VFS_ONEFS_SHADOW_COPY_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_ONEFS_SHADOW_COPY'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_ONEFS_SHADOW_COPY'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs_shadow_copy'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs_shadow_copy'))
bld.SAMBA_MODULE('vfs_dirsort',
subsystem='vfs',
source=VFS_DIRSORT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_DIRSORT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_DIRSORT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dirsort'))
bld.SAMBA_MODULE('vfs_scannedonly',
subsystem='vfs',
source=VFS_SCANNEDONLY_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_SCANNEDONLY'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_SCANNEDONLY'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_scannedonly'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_scannedonly'))
bld.SAMBA_MODULE('vfs_crossrename',
subsystem='vfs',
source=VFS_CROSSRENAME_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_CROSSRENAME'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_CROSSRENAME'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_crossrename'))
bld.SAMBA_MODULE('vfs_linux_xfs_sgid',
subsystem='vfs',
source=VFS_LINUX_XFS_SGID_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_LINUX_XFS_SGID'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_LINUX_XFS_SGID'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_linux_xfs_sgid'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_linux_xfs_sgid'))
bld.SAMBA_MODULE('vfs_time_audit',
subsystem='vfs',
source=VFS_TIME_AUDIT_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('VFS_TIME_AUDIT'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('VFS_TIME_AUDIT'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_time_audit'))
@@ -416,29 +416,29 @@ 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'))
+ 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'))
+ 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'))
+ 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'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('charset_macosxfs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('charset_macosxfs'))
PERFCOUNT_ONEFS_SRC = 'perfcount_onefs.c'
@@ -452,12 +452,12 @@ bld.SAMBA_MODULE('perfcount_onefs',
subsystem='perfcount',
source=PERFCOUNT_ONEFS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_ONEFS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_ONEFS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('perfcount_onefs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('perfcount_onefs'))
bld.SAMBA_MODULE('perfcount_test',
subsystem='perfcount',
source=PERFCOUNT_TEST_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PERFCOUNT_TEST'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PERFCOUNT_TEST'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('perfcount_test'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('perfcount_test'))
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index 665b759092..4a41fe5238 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -15,34 +15,34 @@ bld.SAMBA_MODULE('pdb_tdbsam',
subsystem='pdb',
source=PDB_TDBSAM_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_TDBSAM'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_TDBSAM'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
bld.SAMBA_MODULE('pdb_ldap',
subsystem='pdb',
source=PDB_LDAP_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_LDAP'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_LDAP'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ldap'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ldap'))
bld.SAMBA_MODULE('pdb_ads',
subsystem='pdb',
source=PDB_ADS_SRC,
deps='LIBCLI_LDAP_NDR',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_ADS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_ADS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_ads'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_ads'))
bld.SAMBA_MODULE('pdb_smbpasswd',
subsystem='pdb',
source=PDB_SMBPASSWD_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_SMBPASSWD'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_SMBPASSWD'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_smbpasswd'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_smbpasswd'))
bld.SAMBA_MODULE('pdb_wbc_sam',
subsystem='pdb',
source=PDB_WBC_SAM_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('PDB_WBC_SAM'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('PDB_WBC_SAM'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_wbc_sam'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_wbc_sam'))
diff --git a/source3/rpc_server/wscript_build b/source3/rpc_server/wscript_build
index 0e0d1c67c9..dc368bfd79 100644
--- a/source3/rpc_server/wscript_build
+++ b/source3/rpc_server/wscript_build
@@ -35,102 +35,102 @@ bld.SAMBA_MODULE('rpc_lsarpc',
source='../../librpc/gen_ndr/srv_lsa.c',
deps='RPC_LSARPC',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_LSARPC'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_LSARPC'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_lsarpc'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_lsarpc'))
bld.SAMBA_MODULE('rpc_samr',
subsystem='rpc',
source='../../librpc/gen_ndr/srv_samr.c',
deps='RPC_SAMR',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SAMR'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SAMR'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_samr'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_samr'))
bld.SAMBA_MODULE('rpc_winreg',
subsystem='rpc',
source=RPC_WINREG_SRC,
deps='REGFIO REG_API_REGF NDR_PERFCOUNT',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_WINREG'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_WINREG'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_winreg'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_winreg'))
bld.SAMBA_MODULE('rpc_initshutdown',
subsystem='rpc',
source=RPC_INITSHUTDOWN_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_INITSHUTDOWN'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_INITSHUTDOWN'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_initshutdown'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_initshutdown'))
bld.SAMBA_MODULE('rpc_dssetup',
subsystem='rpc',
source=RPC_DSSETUP_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_DSSETUP'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_DSSETUP'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_dssetup'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_dssetup'))
bld.SAMBA_MODULE('rpc_wkssvc',
subsystem='rpc',
source=RPC_WKSSVC_SRC,
deps='LIBNET',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_WKSSVC'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_WKSSVC'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_wkssvc'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_wkssvc'))
bld.SAMBA_MODULE('rpc_svcctl',
subsystem='rpc',
source=RPC_SVCCTL_SRC,
deps='SERVICES',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SVCCTL'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SVCCTL'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_svcctl'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_svcctl'))
bld.SAMBA_MODULE('rpc_ntsvcs',
subsystem='rpc',
source=RPC_NTSVCS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_NTSVCS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_NTSVCS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_ntsvcs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_ntsvcs'))
bld.SAMBA_MODULE('rpc_netlogon',
subsystem='rpc',
source=RPC_NETLOGON_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_NETLOGON'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_NETLOGON'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_netlogon'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_netlogon'))
bld.SAMBA_MODULE('rpc_netdfs',
subsystem='rpc',
source=RPC_NETDFS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_NETDFS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_NETDFS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_netdfs'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_netdfs'))
bld.SAMBA_MODULE('rpc_srvsvc',
subsystem='rpc',
source=RPC_SRVSVC_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SRVSVC'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SRVSVC'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_srvsvc'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_srvsvc'))
bld.SAMBA_MODULE('rpc_spoolss',
subsystem='rpc',
source=RPC_SPOOLSS_SRC,
deps='cups PRINTING PRINTBACKEND RPCCLI_WINREG',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_SPOOLSS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_SPOOLSS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_spoolss'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_spoolss'))
bld.SAMBA_MODULE('rpc_eventlog',
subsystem='rpc',
source=RPC_EVENTLOG_SRC,
deps='LIBEVENTLOG',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_EVENTLOG'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_EVENTLOG'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_eventlog'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_eventlog'))
bld.SAMBA_MODULE('rpc_rpcecho',
subsystem='rpc',
source=RPC_RPCECHO_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('RPC_RPCECHO'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('RPC_RPCECHO'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('rpc_rpcecho'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('rpc_rpcecho'))
diff --git a/source3/winbindd/wscript_build b/source3/winbindd/wscript_build
index 4ad898c716..fd4bdad422 100644
--- a/source3/winbindd/wscript_build
+++ b/source3/winbindd/wscript_build
@@ -43,73 +43,73 @@ bld.SAMBA_MODULE('idmap_ad',
source='',
deps='IDMAP_AD',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA_MODULE('idmap_rid',
subsystem='idmap',
source=IDMAP_RID_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_RID'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_RID'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_rid'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_rid'))
bld.SAMBA_MODULE('idmap_passdb',
subsystem='idmap',
source=IDMAP_PASSDB_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_PASSDB'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_PASSDB'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_passdb'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_passdb'))
bld.SAMBA_MODULE('idmap_ldap',
subsystem='idmap',
source=IDMAP_LDAP_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_LDAP'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_LDAP'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ldap'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ldap'))
bld.SAMBA_MODULE('idmap_nss',
subsystem='idmap',
source=IDMAP_NSS_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_NSS'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_NSS'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_nss'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_nss'))
bld.SAMBA_MODULE('idmap_tdb',
subsystem='idmap',
source=IDMAP_TDB_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_TDB'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_TDB'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb'))
bld.SAMBA_MODULE('idmap_tdb2',
subsystem='idmap',
source=IDMAP_TDB2_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_TDB2'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_TDB2'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_tdb2'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_tdb2'))
bld.SAMBA_MODULE('idmap_hash',
subsystem='idmap',
source='',
deps='IDMAP_HASH',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_hash'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
bld.SAMBA_MODULE('idmap_adex',
subsystem='idmap',
source='',
deps='IDMAP_ADEX',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex'))
bld.SAMBA_MODULE('idmap_autorid',
subsystem='idmap',
source=IDMAP_AUTORID_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AUTORID'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AUTORID'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_autorid'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_autorid'))
NSS_INFO_TEMPLATE_SRC = 'nss_info_template.c'
@@ -123,45 +123,45 @@ bld.SAMBA_MODULE('nss_info_template',
subsystem='nss_info',
source=NSS_INFO_TEMPLATE_SRC,
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('NSS_INFO_TEMPLATE'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('NSS_INFO_TEMPLATE'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('nss_info_template'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('nss_info_template'))
bld.SAMBA_MODULE('nss_info_adex',
subsystem='nss_info',
source='',
deps='IDMAP_ADEX',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_ADEX'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_ADEX'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_adex'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_adex'))
bld.SAMBA_MODULE('nss_info_hash',
subsystem='nss_info',
source='',
deps='IDMAP_HASH',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_HASH'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_HASH'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_hash'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_hash'))
bld.SAMBA_MODULE('nss_info_rfc2307',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA_MODULE('nss_info_sfu20',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
bld.SAMBA_MODULE('nss_info_sfu',
subsystem='nss_info',
source='',
deps='IDMAP_AD',
init_function='',
- internal_module=bld.SAMBA3_IS_STATIC_MODULE('IDMAP_AD'),
- enabled=bld.SAMBA3_IS_ENABLED_MODULE('IDMAP_AD'))
+ internal_module=bld.SAMBA3_IS_STATIC_MODULE('idmap_ad'),
+ enabled=bld.SAMBA3_IS_ENABLED_MODULE('idmap_ad'))
diff --git a/source3/wscript b/source3/wscript
index 510bed5749..2556ed6a09 100644
--- a/source3/wscript
+++ b/source3/wscript
@@ -390,14 +390,14 @@ return acl_get_perm_np(permset_d, perm);
if p == "rpc":
for entry in static_list[p]:
decl_list += "extern NTSTATUS %s_init(const struct rpc_srv_callbacks *rpc_srv_cb); " % entry
- conf.env[static_env].append('%s' % entry.upper())
+ conf.env[static_env].append('%s' % entry)
decl_list = decl_list.rstrip()
conf.DEFINE('static_decl_%s' % p, decl_list)
conf.DEFINE('static_init_%s' % p, '{ %s_init(NULL); }' % '_init(NULL); '.join(static_list[p]))
else:
for entry in static_list[p]:
decl_list += "extern NTSTATUS %s_init(void); " % entry
- conf.env[static_env].append('%s' % entry.upper())
+ conf.env[static_env].append('%s' % entry)
decl_list = decl_list.rstrip()
conf.DEFINE('static_decl_%s' % p, decl_list)
conf.DEFINE('static_init_%s' % p, '{ %s_init(); }' % '_init(); '.join(static_list[p]))
@@ -407,7 +407,7 @@ return acl_get_perm_np(permset_d, perm);
if p in shared_list:
for entry in shared_list[p]:
conf.DEFINE('%s_init' % entry, 'init_samba_module')
- conf.env[shared_env].append('%s' % entry.upper())
+ conf.env[shared_env].append('%s' % entry)
if Options.options.with_winbind:
conf.env.build_winbind = True