From 0f8018676a6cb33238d506338d4fbb8b683550d3 Mon Sep 17 00:00:00 2001 From: Sean Finney Date: Fri, 20 May 2011 08:12:08 +0000 Subject: Fix numerous missing dependencies in WAF build scripts MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit 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 Signed-off-by: Matthias Dieter Wallnöfer Signed-off-by: Andrew Bartlett Autobuild-User: Matthias Dieter Wallnöfer Autobuild-Date: Wed May 25 19:22:13 CEST 2011 on sn-devel-104 --- source3/auth/wscript_build | 7 +++++++ 1 file changed, 7 insertions(+) (limited to 'source3/auth/wscript_build') diff --git a/source3/auth/wscript_build b/source3/auth/wscript_build index 58929da526..4077b8f5e7 100644 --- a/source3/auth/wscript_build +++ b/source3/auth/wscript_build @@ -16,6 +16,7 @@ AUTH_SRC = '''auth.c bld.SAMBA3_SUBSYSTEM('TOKEN_UTIL', source='token_util.c', + deps='samba-util-common', vars=locals()) bld.SAMBA3_SUBSYSTEM('AUTH_COMMON', @@ -37,6 +38,7 @@ bld.SAMBA3_SUBSYSTEM('auth', bld.SAMBA3_MODULE('auth_sam', subsystem='auth', source=AUTH_SAM_SRC, + deps='samba-util-common', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_sam'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_sam')) @@ -44,6 +46,7 @@ bld.SAMBA3_MODULE('auth_sam', bld.SAMBA3_MODULE('auth_unix', subsystem='auth', source=AUTH_UNIX_SRC, + deps='samba-util-common', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_unix'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_unix')) @@ -51,6 +54,7 @@ bld.SAMBA3_MODULE('auth_unix', bld.SAMBA3_MODULE('auth_winbind', subsystem='auth', source=AUTH_WINBIND_SRC, + deps='samba-util-common', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_winbind'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_winbind')) @@ -58,6 +62,7 @@ bld.SAMBA3_MODULE('auth_winbind', bld.SAMBA3_MODULE('auth_wbc', subsystem='auth', source=AUTH_WBC_SRC, + deps='samba-util-common', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_wbc'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_wbc')) @@ -65,6 +70,7 @@ bld.SAMBA3_MODULE('auth_wbc', bld.SAMBA3_MODULE('auth_server', subsystem='auth', source=AUTH_SERVER_SRC, + deps='samba-util-common', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_server'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_server')) @@ -80,6 +86,7 @@ bld.SAMBA3_MODULE('auth_domain', bld.SAMBA3_MODULE('auth_builtin', subsystem='auth', source=AUTH_BUILTIN_SRC, + deps='samba-util-common', init_function='', internal_module=bld.SAMBA3_IS_STATIC_MODULE('auth_builtin'), enabled=bld.SAMBA3_IS_ENABLED_MODULE('auth_builtin')) -- cgit