summaryrefslogtreecommitdiff
path: root/source4
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-17 20:40:03 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:42 +1000
commitdd05b6512ab2d5c8fc2d0fe18fcd19b62fee6f01 (patch)
tree24f0ad89ac92052b10c51f2e28f90c4fc7f81d64 /source4
parent54e26fcb48e385cf62161cd62f102dd34d1c6b3b (diff)
downloadsamba-dd05b6512ab2d5c8fc2d0fe18fcd19b62fee6f01.tar.gz
samba-dd05b6512ab2d5c8fc2d0fe18fcd19b62fee6f01.tar.bz2
samba-dd05b6512ab2d5c8fc2d0fe18fcd19b62fee6f01.zip
build: improve autoconf macros
- enable headers to be specified - enable both forms of DECL check - more libreplace checks - more heimdal checks - more sysdep checks
Diffstat (limited to 'source4')
-rw-r--r--source4/heimdal_build/wscript_configure4
-rw-r--r--source4/ntvfs/sysdep/wscript_configure6
2 files changed, 7 insertions, 3 deletions
diff --git a/source4/heimdal_build/wscript_configure b/source4/heimdal_build/wscript_configure
index c53cd39d72..37e243cf66 100644
--- a/source4/heimdal_build/wscript_configure
+++ b/source4/heimdal_build/wscript_configure
@@ -24,7 +24,9 @@ conf.DEFINE('VOID_RETSIGTYPE', 1)
conf.CHECK_VARIABLE('h_errno')
# strangely enough, we need it with another define too
-conf.CHECK_VARIABLE('h_errno', define='HAVE_DECL_H_ERRNO')
+conf.CHECK_DECLS('h_errno')
+
+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')
diff --git a/source4/ntvfs/sysdep/wscript_configure b/source4/ntvfs/sysdep/wscript_configure
index 2d2064843e..6cfa4abe91 100644
--- a/source4/ntvfs/sysdep/wscript_configure
+++ b/source4/ntvfs/sysdep/wscript_configure
@@ -3,5 +3,7 @@ conf.CHECK_HEADERS('linux/inotify.h asm/unistd.h sys/inotify.h', add_headers=Fal
conf.CHECK_FUNCS('inotify_init')
conf.CHECK_VARIABLE('__NR_inotify_init')
-conf.CHECK_VARIABLE('F_SETLEASE')
-conf.CHECK_VARIABLE('SA_SIGINFO')
+conf.CHECK_DECLS('F_SETLEASE', headers='linux/fcntl.h', reverse=True)
+conf.CHECK_DECLS('SA_SIGINFO', headers='signal.h', reverse=True)
+
+conf.CHECK_DECLS('__NR_inotify_init', reverse=True, headers='asm/unistd.h')