sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00
Code

build: ensure all libs in CHECK_FUNCS_IN() get a target type

Browse Source
This commit is contained in:
Andrew Tridgell 2010-03-20 17:21:26 +11:00
parent 7628cb7da1
commit 593c28b717
1 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
buildtools/wafsamba/samba_autoconf.py
View File

@ -295,20 +295,26 @@ def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False):
remaining = TO_LIST(list)
if remaining == []:
if GET_TARGET_TYPE(conf, library) != 'SYSLIB':
SET_TARGET_TYPE(conf, library, 'EMPTY')
for lib in TO_LIST(library):
if GET_TARGET_TYPE(conf, lib) != 'SYSLIB':
SET_TARGET_TYPE(conf, lib, 'EMPTY')
return True
ret = True
for lib in TO_LIST(library):
if not conf.check(lib=lib, uselib_store=lib):
conf.ASSERT(not mandatory,
"Mandatory library '%s' not found for functions '%s'" % (library, list))
# if it isn't a mandatory library, then remove it from dependency lists
SET_TARGET_TYPE(conf, library, 'EMPTY')
return False
conf.define('HAVE_LIB%s' % string.replace(lib.upper(),'-','_'), 1)
conf.env['LIB_' + lib.upper()] = lib
LOCAL_CACHE_SET(conf, 'TARGET_TYPE', lib, 'SYSLIB')
ret = False
else:
conf.define('HAVE_LIB%s' % string.replace(lib.upper(),'-','_'), 1)
conf.env['LIB_' + lib.upper()] = lib
LOCAL_CACHE_SET(conf, 'TARGET_TYPE', lib, 'SYSLIB')
if not ret:
return ret
ret = True
for f in remaining: