summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-20 17:21:26 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:57 +1000
commit593c28b717b081bdd6e19ebdb086da88834a7385 (patch)
treec612202d76ae05049d2d57084a723a33f8bdc627
parent7628cb7da1d2b1f5bcdacecfd27866aad8b199a2 (diff)
downloadsamba-593c28b717b081bdd6e19ebdb086da88834a7385.tar.gz
samba-593c28b717b081bdd6e19ebdb086da88834a7385.tar.bz2
samba-593c28b717b081bdd6e19ebdb086da88834a7385.zip
build: ensure all libs in CHECK_FUNCS_IN() get a target type
-rw-r--r--buildtools/wafsamba/samba_autoconf.py18
1 files changed, 12 insertions, 6 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 6ad188b760..59a70aa5f1 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -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: