From fd6d29bc08cacbd5270599aab52e0006bea2002f Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Mon, 1 Nov 2010 12:29:04 +1100 Subject: waf: added module_init_name parameter to SAMBA_MODULE() this will be used for ldb module loading --- buildtools/wafsamba/wafsamba.py | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/buildtools/wafsamba/wafsamba.py b/buildtools/wafsamba/wafsamba.py index 35b39d3652..54e5bbebc8 100644 --- a/buildtools/wafsamba/wafsamba.py +++ b/buildtools/wafsamba/wafsamba.py @@ -336,6 +336,7 @@ def SAMBA_MODULE(bld, modname, source, includes='', subsystem=None, init_function=None, + module_init_name='samba_init_module', autoproto=None, autoproto_extra_source='', aliases=None, @@ -371,7 +372,7 @@ def SAMBA_MODULE(bld, modname, source, # if we have aliases, then create a private base library, and a set # of modules on top of that library if init_function: - cflags += " -D%s=samba_init_module" % init_function + cflags += " -D%s=%s" % (init_function, module_init_name) basename = modname + '-base' bld.SAMBA_LIBRARY(basename, @@ -415,7 +416,7 @@ def SAMBA_MODULE(bld, modname, source, build_link_name = "modules/%s/%s" % (subsystem, realname) if init_function: - cflags += " -D%s=samba_init_module" % init_function + cflags += " -D%s=%s" % (init_function, module_init_name) bld.SAMBA_LIBRARY(modname, source, -- cgit