sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-03-27 22:50:26 +03:00
Code

s4-waf: set default for bundled libraries

Browse Source
This commit is contained in:
Andrew Tridgell 2010-03-28 15:42:28 +11:00
parent 3b380ea7ac
commit c2d17cf978
7 changed files with 18 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/replace/wscript
View File

@ -9,6 +9,8 @@ import wafsamba
import Options, os, preproc
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.BUNDLED_EXTENSION_DEFAULT('')
opt.recurse('../../buildtools/wafsamba')
@wafsamba.runonce

6
lib/talloc/wscript
View File

@ -7,7 +7,13 @@ blddir = 'bin'
LIBREPLACE_DIR= srcdir + '/lib/replace'
import sys
sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
opt.BUNDLED_EXTENSION_DEFAULT('talloc', noextenion='talloc')
opt.recurse(LIBREPLACE_DIR)
def configure(conf):

3
lib/tdb/wscript
View File

@ -13,10 +13,11 @@ import wafsamba
LIBREPLACE_DIR= srcdir + '/lib/replace'
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
opt.BUNDLED_EXTENSION_DEFAULT('tdb', noextenion='tdb')
opt.recurse(LIBREPLACE_DIR)
def configure(conf):
conf.BUNDLED_LIBRARY_EXTENSION('tdb')
conf.sub_config(LIBREPLACE_DIR)
conf.SAMBA_CONFIG_H()

3
lib/tevent/wscript
View File

@ -13,11 +13,12 @@ LIBREPLACE_DIR= srcdir + '/lib/replace'
LIBTALLOC_DIR= srcdir + '/lib/talloc'
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
opt.BUNDLED_EXTENSION_DEFAULT('tevent', noextenion='tevent')
opt.recurse(LIBREPLACE_DIR)
opt.recurse(LIBTALLOC_DIR)
def configure(conf):
conf.BUNDLED_LIBRARY_EXTENSION('tevent')
conf.sub_config(LIBREPLACE_DIR)
conf.sub_config(LIBTALLOC_DIR)

2
source3/wscript
View File

@ -10,6 +10,8 @@ import build.charset
from samba_utils import *
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.BUNDLED_EXTENSION_DEFAULT('s3')
opt.recurse('../lib/replace')
opt.recurse('build')
opt.recurse('../lib/nss_wrapper')

4
source4/lib/ldb/wscript
View File

@ -13,12 +13,12 @@ LIBTDB_DIR= srcdir + '/lib/tdb'
LIBTEVENT_DIR= srcdir + '/lib/tevent'
def set_options(opt):
opt.BUILTIN_DEFAULT('replace')
opt.BUNDLED_EXTENSION_DEFAULT('ldb', noextenion='ldb')
opt.recurse(LIBTDB_DIR)
opt.recurse(LIBTEVENT_DIR)
def configure(conf):
conf.BUNDLED_LIBRARY_EXTENSION('ldb')
conf.sub_config(LIBTDB_DIR)
conf.sub_config(LIBTEVENT_DIR)
# where does the default LIBDIR end up? in conf.env somewhere?

4
source4/wscript
View File

@ -8,6 +8,8 @@ sys.path.insert(0, srcdir+"/buildtools/wafsamba")
import wafsamba, Options
def set_options(opt):
opt.BUILTIN_DEFAULT('NONE')
opt.BUNDLED_EXTENSION_DEFAULT('s4')
opt.recurse('../lib/replace')
opt.recurse('dynconfig')
opt.recurse('scripting/python')
@ -32,8 +34,6 @@ def configure(conf):
conf.DEFINE('_SAMBA_BUILD_', 4, add_to_cflags=True)
conf.DEFINE('HAVE_CONFIG_H', 1, add_to_cflags=True)
conf.BUNDLED_LIBRARY_EXTENSION('s4')
if Options.options.developer:
conf.ADD_CFLAGS('-DDEVELOPER -DDEBUG_PASSWORD')