diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2012-09-04 20:06:12 +1000 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2012-09-04 20:16:49 +1000 |
| commit | a566404362cc7e45b5ce619db81175b55c55c288 (patch) | |
| tree | 59f2a62d35531504203b2a3da61cba724145f061 | |
| parent | cac1ebfff6c83bfe6cec3a740dface97f706f9ff (diff) | |
| download | samba-a566404362cc7e45b5ce619db81175b55c55c288.tar.gz samba-a566404362cc7e45b5ce619db81175b55c55c288.tar.bz2 samba-a566404362cc7e45b5ce619db81175b55c55c288.zip | |
build: Remove references to charset modules - we no longer have these
| -rw-r--r-- | source3/modules/wscript_build | 1 | ||||
| -rwxr-xr-x | source3/wscript | 3 |
2 files changed, 1 insertions, 3 deletions
diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build index aa4cc6b198..dee7ea319d 100644 --- a/source3/modules/wscript_build +++ b/source3/modules/wscript_build @@ -228,6 +228,7 @@ bld.SAMBA3_MODULE('vfs_solarisacl', subsystem='vfs', source=VFS_SOLARISACL_SRC, init_function='', + deps='sec', internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_solarisacl'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_solarisacl')) diff --git a/source3/wscript b/source3/wscript index 4e39c3af28..90fb1018fa 100755 --- a/source3/wscript +++ b/source3/wscript @@ -1440,9 +1440,6 @@ main() { if conf.CHECK_HEADERS('gpfs_gpl.h'): conf.DEFINE('HAVE_GPFS', '1') - # Note that all charset 'modules' must actually be static, due to dependency loop issues - # if we include the module loader in iconv - default_static_modules=TO_LIST('''pdb_smbpasswd pdb_tdbsam pdb_wbc_sam auth_sam auth_unix auth_winbind auth_wbc auth_domain auth_builtin vfs_default |