summaryrefslogtreecommitdiff
path: root/buildtools
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-20 19:41:41 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:58 +1000
commit19ed4c709526ef59d3f59f736c224bd16bfcfb3d (patch)
tree51c108d6b49945784a3694213c90abfed180b210 /buildtools
parent8253fe0c727cdeb2b268be50be6dd6fb2729b313 (diff)
downloadsamba-19ed4c709526ef59d3f59f736c224bd16bfcfb3d.tar.gz
samba-19ed4c709526ef59d3f59f736c224bd16bfcfb3d.tar.bz2
samba-19ed4c709526ef59d3f59f736c224bd16bfcfb3d.zip
build: if a library is found, but not the fn, still define the library
Diffstat (limited to 'buildtools')
-rw-r--r--buildtools/wafsamba/samba_autoconf.py11
1 files changed, 2 insertions, 9 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 6f8985a521..4ea29d4058 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -338,6 +338,8 @@ def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False, header
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
@@ -347,15 +349,6 @@ def CHECK_FUNCS_IN(conf, list, library, mandatory=False, checklibc=False, header
if not conf.check_cc(function_name=f, lib=liblist, header_name=hlist):
ret = False
- if not ret:
- return ret
-
- for lib in liblist:
- if GET_TARGET_TYPE(conf, lib):
- continue
- conf.env['LIB_' + lib.upper()] = lib
- LOCAL_CACHE_SET(conf, 'TARGET_TYPE', lib, 'SYSLIB')
-
return ret