Fix numerous missing dependencies in WAF build scripts

With the recent consolidation of code between s3 and s4, a number of new
dependencies have been implicitly introduced.  For example, previous s3
code gained an implicit dependency on talloc after the charset related
consolidation (lib/util/charset/charset.h now includes talloc.h).  When
building against the embedded version of talloc this isn't a problem
since the paths are automatically added to the search path, but when
building against the external libraries build failures will occur for
all components that don't directly or indirectly include talloc as
a dependency.

Since charset.h is included from util.h, which in turn is included from
includes.h, this means most of the codebase (s3 and s4) has such an
undeclared dependency.

Therefore, samba-util-common and samba-util have been added as
dependencies to the s3 and s4 code respectively, for all cases where
the source would otherwise fail to build.  Additionally, a few other
dependencies are added in specific wscript_build files to address
similar dependency-related problems.

https://bugzilla.samba.org/show_bug.cgi?id=8128

Signed-off-by: Sean Finney <seanius@seanius.net>
Signed-off-by: Matthias Dieter Wallnöfer <mdw@samba.org>
Signed-off-by: Andrew Bartlett <abartlet@samba.org>

Autobuild-User: Matthias Dieter Wallnöfer <mdw@samba.org>
Autobuild-Date: Wed May 25 19:22:13 CEST 2011 on sn-devel-104

1 files changed, 37 insertions, 2 deletions

diff --git a/source3/modules/wscript_build b/source3/modules/wscript_build
index a16a4f292f..9a6a6c3c15 100644
--- a/source3/modules/wscript_build
+++ b/source3/modules/wscript_build
@@ -53,7 +53,8 @@ VFS_TIME_AUDIT_SRC = 'vfs_time_audit.c'
 
 
 bld.SAMBA3_SUBSYSTEM('NFS4_ACLS',
-                    source='nfs4_acls.c')
+                    source='nfs4_acls.c',
+                    deps='samba-util-common')
 
 bld.SAMBA3_SUBSYSTEM('VFS_AIXACL_UTIL',
                     source='vfs_aixacl_util.c',
@@ -67,6 +68,7 @@ bld.SAMBA3_SUBSYSTEM('vfs',
 bld.SAMBA3_MODULE('vfs_default',
                  subsystem='vfs',
                  source=VFS_DEFAULT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default'))
@@ -74,6 +76,7 @@ bld.SAMBA3_MODULE('vfs_default',
 bld.SAMBA3_MODULE('vfs_audit',
                  subsystem='vfs',
                  source=VFS_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_audit'))
@@ -81,6 +84,7 @@ bld.SAMBA3_MODULE('vfs_audit',
 bld.SAMBA3_MODULE('vfs_extd_audit',
                  subsystem='vfs',
                  source=VFS_EXTD_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_extd_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_extd_audit'))
@@ -88,6 +92,7 @@ bld.SAMBA3_MODULE('vfs_extd_audit',
 bld.SAMBA3_MODULE('vfs_full_audit',
                  subsystem='vfs',
                  source=VFS_FULL_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_full_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_full_audit'))
@@ -95,7 +100,7 @@ bld.SAMBA3_MODULE('vfs_full_audit',
 bld.SAMBA3_MODULE('vfs_fake_perms',
                  subsystem='vfs',
                  source=VFS_FAKE_PERMS_SRC,
-                 deps='acl attr',
+                 deps='acl attr samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fake_perms'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fake_perms'))
@@ -103,6 +108,7 @@ bld.SAMBA3_MODULE('vfs_fake_perms',
 bld.SAMBA3_MODULE('vfs_recycle',
                  subsystem='vfs',
                  source=VFS_RECYCLE_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_recycle'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_recycle'))
@@ -110,6 +116,7 @@ bld.SAMBA3_MODULE('vfs_recycle',
 bld.SAMBA3_MODULE('vfs_netatalk',
                  subsystem='vfs',
                  source=VFS_NETATALK_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_netatalk'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_netatalk'))
@@ -117,6 +124,7 @@ bld.SAMBA3_MODULE('vfs_netatalk',
 bld.SAMBA3_MODULE('vfs_default_quota',
                  subsystem='vfs',
                  source=VFS_DEFAULT_QUOTA_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_default_quota'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_default_quota'))
@@ -124,6 +132,7 @@ bld.SAMBA3_MODULE('vfs_default_quota',
 bld.SAMBA3_MODULE('vfs_readonly',
                  subsystem='vfs',
                  source=VFS_READONLY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readonly'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readonly'))
@@ -131,6 +140,7 @@ bld.SAMBA3_MODULE('vfs_readonly',
 bld.SAMBA3_MODULE('vfs_cap',
                  subsystem='vfs',
                  source=VFS_CAP_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cap'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cap'))
@@ -138,6 +148,7 @@ bld.SAMBA3_MODULE('vfs_cap',
 bld.SAMBA3_MODULE('vfs_expand_msdfs',
                  subsystem='vfs',
                  source=VFS_EXPAND_MSDFS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_expand_msdfs'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_expand_msdfs'))
@@ -145,6 +156,7 @@ bld.SAMBA3_MODULE('vfs_expand_msdfs',
 bld.SAMBA3_MODULE('vfs_shadow_copy',
                  subsystem='vfs',
                  source=VFS_SHADOW_COPY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy'))
@@ -152,6 +164,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy',
 bld.SAMBA3_MODULE('vfs_shadow_copy2',
                  subsystem='vfs',
                  source=VFS_SHADOW_COPY2_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_shadow_copy2'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_shadow_copy2'))
@@ -159,6 +172,7 @@ bld.SAMBA3_MODULE('vfs_shadow_copy2',
 bld.SAMBA3_MODULE('vfs_afsacl',
                  subsystem='vfs',
                  source=VFS_AFSACL_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_afsacl'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_afsacl'))
@@ -234,6 +248,7 @@ bld.SAMBA3_MODULE('vfs_tru64acl',
 bld.SAMBA3_MODULE('vfs_catia',
                  subsystem='vfs',
                  source=VFS_CATIA_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_catia'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_catia'))
@@ -241,6 +256,7 @@ bld.SAMBA3_MODULE('vfs_catia',
 bld.SAMBA3_MODULE('vfs_streams_xattr',
                  subsystem='vfs',
                  source=VFS_STREAMS_XATTR_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_xattr'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_xattr'))
@@ -248,6 +264,7 @@ bld.SAMBA3_MODULE('vfs_streams_xattr',
 bld.SAMBA3_MODULE('vfs_streams_depot',
                  subsystem='vfs',
                  source=VFS_STREAMS_DEPOT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_streams_depot'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_streams_depot'))
@@ -255,6 +272,7 @@ bld.SAMBA3_MODULE('vfs_streams_depot',
 bld.SAMBA3_MODULE('vfs_cacheprime',
                  subsystem='vfs',
                  source=VFS_CACHEPRIME_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_cacheprime'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_cacheprime'))
@@ -262,6 +280,7 @@ bld.SAMBA3_MODULE('vfs_cacheprime',
 bld.SAMBA3_MODULE('vfs_prealloc',
                  subsystem='vfs',
                  source=VFS_PREALLOC_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_prealloc'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_prealloc'))
@@ -269,6 +288,7 @@ bld.SAMBA3_MODULE('vfs_prealloc',
 bld.SAMBA3_MODULE('vfs_commit',
                  subsystem='vfs',
                  source=VFS_COMMIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_commit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_commit'))
@@ -298,6 +318,7 @@ bld.SAMBA3_MODULE('vfs_notify_fam',
 bld.SAMBA3_MODULE('vfs_readahead',
                  subsystem='vfs',
                  source=VFS_READAHEAD_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_readahead'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_readahead'))
@@ -305,6 +326,7 @@ bld.SAMBA3_MODULE('vfs_readahead',
 bld.SAMBA3_MODULE('vfs_tsmsm',
                  subsystem='vfs',
                  source=VFS_TSMSM_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_tsmsm'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_tsmsm'))
@@ -312,6 +334,7 @@ bld.SAMBA3_MODULE('vfs_tsmsm',
 bld.SAMBA3_MODULE('vfs_fileid',
                  subsystem='vfs',
                  source=VFS_FILEID_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_fileid'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_fileid'))
@@ -319,6 +342,7 @@ bld.SAMBA3_MODULE('vfs_fileid',
 bld.SAMBA3_MODULE('vfs_aio_fork',
                  subsystem='vfs',
                  source=VFS_AIO_FORK_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_aio_fork'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_aio_fork'))
@@ -326,6 +350,7 @@ bld.SAMBA3_MODULE('vfs_aio_fork',
 bld.SAMBA3_MODULE('vfs_preopen',
                  subsystem='vfs',
                  source=VFS_PREOPEN_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_preopen'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_preopen'))
@@ -333,6 +358,7 @@ bld.SAMBA3_MODULE('vfs_preopen',
 bld.SAMBA3_MODULE('vfs_syncops',
                  subsystem='vfs',
                  source=VFS_SYNCOPS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_syncops'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_syncops'))
@@ -340,6 +366,7 @@ bld.SAMBA3_MODULE('vfs_syncops',
 bld.SAMBA3_MODULE('vfs_acl_xattr',
                  subsystem='vfs',
                  source=VFS_ACL_XATTR_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_acl_xattr'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_acl_xattr'))
@@ -355,6 +382,7 @@ bld.SAMBA3_MODULE('vfs_acl_tdb',
 bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
                  subsystem='vfs',
                  source=VFS_SMB_TRAFFIC_ANALYZER_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_smb_traffic_analyzer'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_smb_traffic_analyzer'))
@@ -362,6 +390,7 @@ bld.SAMBA3_MODULE('vfs_smb_traffic_analyzer',
 bld.SAMBA3_MODULE('vfs_onefs',
                  subsystem='vfs',
                  source=VFS_ONEFS_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs'))
@@ -369,6 +398,7 @@ bld.SAMBA3_MODULE('vfs_onefs',
 bld.SAMBA3_MODULE('vfs_onefs_shadow_copy',
                  subsystem='vfs',
                  source=VFS_ONEFS_SHADOW_COPY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_onefs_shadow_copy'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_onefs_shadow_copy'))
@@ -376,6 +406,7 @@ bld.SAMBA3_MODULE('vfs_onefs_shadow_copy',
 bld.SAMBA3_MODULE('vfs_dirsort',
                  subsystem='vfs',
                  source=VFS_DIRSORT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_dirsort'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_dirsort'))
@@ -383,6 +414,7 @@ bld.SAMBA3_MODULE('vfs_dirsort',
 bld.SAMBA3_MODULE('vfs_scannedonly',
                  subsystem='vfs',
                  source=VFS_SCANNEDONLY_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_scannedonly'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_scannedonly'))
@@ -390,6 +422,7 @@ bld.SAMBA3_MODULE('vfs_scannedonly',
 bld.SAMBA3_MODULE('vfs_crossrename',
                  subsystem='vfs',
                  source=VFS_CROSSRENAME_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_crossrename'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_crossrename'))
@@ -397,6 +430,7 @@ bld.SAMBA3_MODULE('vfs_crossrename',
 bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
                  subsystem='vfs',
                  source=VFS_LINUX_XFS_SGID_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_linux_xfs_sgid'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_linux_xfs_sgid'))
@@ -404,6 +438,7 @@ bld.SAMBA3_MODULE('vfs_linux_xfs_sgid',
 bld.SAMBA3_MODULE('vfs_time_audit',
                  subsystem='vfs',
                  source=VFS_TIME_AUDIT_SRC,
+                 deps='samba-util-common',
                  init_function='',
                  internal_module=bld.SAMBA3_IS_STATIC_MODULE('vfs_time_audit'),
                  enabled=bld.SAMBA3_IS_ENABLED_MODULE('vfs_time_audit'))