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

1 files changed, 106 insertions, 106 deletions

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'))