sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-09-17 05:44:20 +03:00
Code Activity

s4-waf: don't try to use the system lib for the library build

Browse Source 
when building library FOO, don't try to find the system library FOO
    
Pair-Programmed-With: Andrew Bartlett <abartlet@samba.org>
This commit is contained in:
Andrew Tridgell
2010-04-13 21:33:04 +10:00
parent 483d059c8e
commit c10d267a76
3 changed files with 17 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
lib/talloc/wscript
View File

@@ -33,12 +33,13 @@ def set_options(opt):
def configure(conf): def configure(conf):
conf.RECURSE('lib/replace') conf.RECURSE('lib/replace')
conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
if not conf.env.standalone_talloc:
if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM('talloc', minversion=VERSION,
implied_deps='replace'): implied_deps='replace'):
conf.define('USING_SYSTEM_TALLOC', 1) conf.define('USING_SYSTEM_TALLOC', 1)
conf.env.standalone_talloc = conf.IN_LAUNCH_DIR()
conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1 conf.env.TALLOC_COMPAT1 = Options.options.TALLOC_COMPAT1
if conf.env.standalone_talloc: if conf.env.standalone_talloc:

5
lib/tdb/wscript
View File

@@ -30,11 +30,13 @@ def set_options(opt):
def configure(conf): def configure(conf):
conf.RECURSE('lib/replace') conf.RECURSE('lib/replace')
conf.env.standalone_tdb = conf.IN_LAUNCH_DIR()
if not conf.env.standalone_tdb:
if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM('tdb', minversion=VERSION,
implied_deps='replace'): implied_deps='replace'):
conf.define('USING_SYSTEM_TDB', 1) conf.define('USING_SYSTEM_TDB', 1)
conf.env.standalone_tdb = conf.IN_LAUNCH_DIR()
conf.env.disable_python = getattr(Options.options, 'disable_python', False) conf.env.disable_python = getattr(Options.options, 'disable_python', False)
if conf.env.standalone_tdb: if conf.env.standalone_tdb:
@@ -93,7 +95,6 @@ def build(bld):
if bld.env.standalone_tdb: if bld.env.standalone_tdb:
bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig' bld.env.PKGCONFIGDIR = '${LIBDIR}/pkgconfig'
bld.env.TALLOC_VERSION = VERSION
bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION) bld.PKG_CONFIG_FILES('tdb.pc', vnum=VERSION)
bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True) bld.INSTALL_FILES('${INCLUDEDIR}', 'include/tdb.h', flat=True)

2
source4/lib/ldb/wscript
View File

@@ -37,8 +37,10 @@ def configure(conf):
s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4 s4_build = getattr(conf.env, '_SAMBA_BUILD_', 0) == 4
conf.env.standalone_ldb = conf.IN_LAUNCH_DIR()
if not s4_build: if not s4_build:
if not conf.env.standalone_ldb:
if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION, if conf.CHECK_BUNDLED_SYSTEM('ldb', minversion=VERSION,
onlyif='talloc tdb tevent', onlyif='talloc tdb tevent',
implied_deps='replace talloc tdb tevent'): implied_deps='replace talloc tdb tevent'):