summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-07 16:18:44 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:43 +1000
commitaac8aec0d1bd07aa4a2521c87807b88f54ac090d (patch)
tree072a1eb845b9a15a02158dd587962f80aad965f4
parent2dfced59d56eae96540bb8721ccfa50487dbdd40 (diff)
downloadsamba-aac8aec0d1bd07aa4a2521c87807b88f54ac090d.tar.gz
samba-aac8aec0d1bd07aa4a2521c87807b88f54ac090d.tar.bz2
samba-aac8aec0d1bd07aa4a2521c87807b88f54ac090d.zip
build: more config checks
-rw-r--r--lib/replace/wscript3
-rw-r--r--source4/lib/tls/wscript3
2 files changed, 6 insertions, 0 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 1994e34877..399654cceb 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -119,6 +119,7 @@ def configure(conf):
conf.CHECK_FUNCS('connect gethostbyname if_nametoindex socketpair')
conf.CHECK_FUNCS('inet_ntoa inet_aton inet_ntop inet_pton')
conf.CHECK_FUNCS('dirfd getdirentries getdents syslog getaddrinfo freeaddrinfo')
+ conf.CHECK_FUNCS('gai_strerror')
conf.CHECK_FUNCS('timegm getifaddrs freeifaddrs mmap setgroups setsid')
conf.CHECK_FUNCS('getgrent_r getgrgid_r getgrnam_r getgrouplist getpagesize')
conf.CHECK_FUNCS('getpwent_r getpwnam_r getpwuid_r epoll_create')
@@ -133,6 +134,8 @@ def configure(conf):
conf.CHECK_VARIABLE('rl_event_hook', define='HAVE_DECL_RL_EVENT_HOOK', always=True)
+ conf.CHECK_VARIABLE('__FUNCTION__', define='HAVE_FUNCTION_MACRO')
+
conf.CHECK_DECLS('snprintf vsnprintf asprintf vasprintf')
conf.CHECK_DECLS('dirfd environ errno getgrent_r getpwent_r', reverse=True)
diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript
index 5a6375720e..d2a55b6ee4 100644
--- a/source4/lib/tls/wscript
+++ b/source4/lib/tls/wscript
@@ -20,6 +20,9 @@ def configure(conf):
# check for gnutls_datum types
conf.CHECK_TYPES('gnutls_datum gnutls_datum_t')
+ conf.CHECK_HEADERS('gcrypt.h')
+ conf.CHECK_FUNCS_IN('gcry_control', 'gcrypt')
+
def build(bld):
bld.SAMBA_SUBSYSTEM('LIBTLS',
source='tls.c tlscert.c',