diff options
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/heimdal_build/wscript_configure | 22 | ||||
| -rw-r--r-- | source4/lib/ldb/wscript | 2 | ||||
| -rw-r--r-- | source4/lib/tls/wscript | 9 |
3 files changed, 14 insertions, 19 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure index 83d171cbee..0f28f23e55 100644 --- a/source4/heimdal_build/wscript_configure +++ b/source4/heimdal_build/wscript_configure @@ -9,7 +9,7 @@ conf.CHECK_HEADERS('''crypt.h errno.h inttypes.h netdb.h signal.h sys/bswap.h sys/utsname.h time.h timezone.h ttyname.h netinet/in.h netinet/in6.h netinet6/in6.h libintl.h''') -conf.CHECK_HEADERS('curses.h term.h termcap.h', add_headers=False) +conf.CHECK_HEADERS('curses.h term.h termcap.h') conf.CHECK_FUNCS('''atexit cgetent getprogname setprogname gethostname putenv rcmd readv sendmsg setitimer strlwr strncasecmp @@ -23,27 +23,25 @@ conf.CHECK_FUNCS_IN('''getnameinfo sendmsg socket getipnodebyname gethostent get 'socket nsl', checklibc=True) -conf.CHECK_FUNCS('iruserok', checklink=True) +conf.CHECK_FUNCS('iruserok') conf.CHECK_FUNCS('bswap16') conf.CHECK_FUNCS('bswap32') -conf.CHECK_TYPE('struct winsize', define='HAVE_STRUCT_WINSIZE') +conf.CHECK_TYPE('struct winsize', define='HAVE_STRUCT_WINSIZE', headers='sys/termios.h sys/ioctl.h') conf.DEFINE('HAVE_KRB_STRUCT_WINSIZE', 1) conf.DEFINE('VOID_RETSIGTYPE', 1) -conf.CHECK_VARIABLE('h_errno') +conf.CHECK_VARIABLE('h_errno', headers='netdb.h') # strangely enough, we need it with another define too -conf.CHECK_DECLS('h_errno') +conf.CHECK_DECLS('h_errno', headers='netdb.h') -conf.CHECK_DECLS('_res') - -conf.CHECK_HEADERS('arpa/nameser.h dns.h') -conf.CHECK_FUNCS_IN('res_search res_nsearch res_ndestroy dns_search dn_expand', 'resolv', checklibc=True) -conf.CHECK_VARIABLE('_res') -conf.CHECK_HEADERS('pty.h util.h libutil.h') -conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True) +conf.CHECK_FUNCS_IN('res_search res_nsearch res_ndestroy dns_search dn_expand', 'resolv', + checklibc=True, headers='netinet/in.h arpa/nameser.h resolv.h dns.h') +conf.CHECK_VARIABLE('_res', headers='netinet/in.h arpa/nameser.h resolv.h') +conf.CHECK_DECLS('_res', headers='netinet/in.h arpa/nameser.h resolv.h') +conf.CHECK_FUNCS_IN('openpty', 'util', checklibc=True, headers='pty.h util.h libutil.h') conf.DEFINE('HAVE_KRB5',1) conf.DEFINE('HAVE_GSSAPI',1) diff --git a/source4/lib/ldb/wscript b/source4/lib/ldb/wscript index 053d11200f..92cefab8af 100644 --- a/source4/lib/ldb/wscript +++ b/source4/lib/ldb/wscript @@ -19,7 +19,7 @@ def configure(conf): conf.sub_config(LIBTEVENT_DIR) # where does the default LIBDIR end up? in conf.env somewhere? # - conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('LIBDIR') + '/ldb') + conf.CONFIG_PATH('LDB_MODULESDIR', conf.SUBST_ENV_VAR('MODULESDIR') + '/ldb') conf.SAMBA_CONFIG_H() def build(bld): diff --git a/source4/lib/tls/wscript b/source4/lib/tls/wscript index 45fa55aaef..a993848cf9 100644 --- a/source4/lib/tls/wscript +++ b/source4/lib/tls/wscript @@ -15,15 +15,12 @@ def configure(conf): if 'HAVE_GNUTLS' in conf.env and not Options.options.disable_gnutls: conf.DEFINE('ENABLE_GNUTLS', 1) - conf.CHECK_FUNCS_IN('gnutls_global_init', 'gnutls', header='gnutls/gnutls.h') - - conf.CHECK_HEADERS('gnutls/gnutls.h') + conf.CHECK_FUNCS_IN('gnutls_global_init', 'gnutls', headers='gnutls/gnutls.h') # check for gnutls_datum types - conf.CHECK_TYPES('gnutls_datum gnutls_datum_t') + conf.CHECK_TYPES('gnutls_datum gnutls_datum_t', headers='gnutls/gnutls.h') - conf.CHECK_HEADERS('gcrypt.h') - conf.CHECK_FUNCS_IN('gcry_control', 'gcrypt') + conf.CHECK_FUNCS_IN('gcry_control', 'gcrypt', headers='gcrypt.h') conf.CHECK_FUNCS_IN('gpg_err_code_from_errno', 'gpg-error') |