summaryrefslogtreecommitdiff
path: root/source4/heimdal_build/wscript_configure
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-23 09:29:51 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:27:00 +1000
commit00649a9c6266f959dbc7d857180e43f2b1363844 (patch)
tree52fb65dfd462e2a4baf5865a1a6c662c7f9dffc0 /source4/heimdal_build/wscript_configure
parentf95ca1afc984ecf295b9181b2f699a72afcb4772 (diff)
downloadsamba-00649a9c6266f959dbc7d857180e43f2b1363844.tar.gz
samba-00649a9c6266f959dbc7d857180e43f2b1363844.tar.bz2
samba-00649a9c6266f959dbc7d857180e43f2b1363844.zip
build: updated configure checks or new syntax
Diffstat (limited to 'source4/heimdal_build/wscript_configure')
-rw-r--r--source4/heimdal_build/wscript_configure22
1 files changed, 10 insertions, 12 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)