summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-20 17:51:39 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:57 +1000
commit508cb5b97ec843aff26d60915578b2eb6cc155fc (patch)
tree44b6f41bb10dfc166218c7482569aa72a854f1a4
parent055c4898e73f91cf196b03346323d1837ffd8251 (diff)
downloadsamba-508cb5b97ec843aff26d60915578b2eb6cc155fc.tar.gz
samba-508cb5b97ec843aff26d60915578b2eb6cc155fc.tar.bz2
samba-508cb5b97ec843aff26d60915578b2eb6cc155fc.zip
build: cope with double check for functions
-rw-r--r--buildtools/wafsamba/samba_autoconf.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/buildtools/wafsamba/samba_autoconf.py b/buildtools/wafsamba/samba_autoconf.py
index 0b26860033..dc1a0b3094 100644
--- a/buildtools/wafsamba/samba_autoconf.py
+++ b/buildtools/wafsamba/samba_autoconf.py
@@ -125,8 +125,11 @@ def CHECK_DECLS(conf, vars, reverse=False, headers=None):
@runonce
def CHECK_FUNC(conf, f, checklink=False):
'''check for a function'''
+ define='HAVE_%s' % f.upper()
+ if CONFIG_SET(define):
+ return True
if checklink:
- return CHECK_CODE(conf, '%s()' % f, execute=False, define='HAVE_%s' % f.upper())
+ return CHECK_CODE(conf, '%s()' % f, execute=False, define=define)
return conf.check(function_name=f, header_name=conf.env.hlist)