summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2010-03-07 14:07:32 +1100
committerAndrew Tridgell <tridge@samba.org>2010-04-06 20:26:42 +1000
commitcbb3c6eece5780977a2d1c9ac39ff609d48c134e (patch)
treee4d112006d3cababc2b12a7a427dd2fca14a2bbf
parent62137089a0c9fd4c1081f098e84a30ed040f67c4 (diff)
downloadsamba-cbb3c6eece5780977a2d1c9ac39ff609d48c134e.tar.gz
samba-cbb3c6eece5780977a2d1c9ac39ff609d48c134e.tar.bz2
samba-cbb3c6eece5780977a2d1c9ac39ff609d48c134e.zip
build: check for backtrace
-rw-r--r--lib/replace/wscript2
-rw-r--r--lib/util/wscript_configure6
-rw-r--r--source4/wscript1
3 files changed, 8 insertions, 1 deletions
diff --git a/lib/replace/wscript b/lib/replace/wscript
index 405e80136b..368791cf5b 100644
--- a/lib/replace/wscript
+++ b/lib/replace/wscript
@@ -72,7 +72,7 @@ def configure(conf):
conf.CHECK_HEADERS('sys/uio.h ifaddrs.h direct.h dirent.h')
conf.CHECK_HEADERS('windows.h winsock2.h ws2tcpip.h')
conf.CHECK_HEADERS('resolv.h libintl.h errno.h')
- conf.CHECK_HEADERS('execinfo.h gcrypt.h getopt.h iconv.h')
+ conf.CHECK_HEADERS('gcrypt.h getopt.h iconv.h')
conf.CHECK_HEADERS('sys/inotify.h memory.h nss.h popt.h sasl/sasl.h')
conf.CHECK_HEADERS('security/pam_appl.h sys/inotify.h zlib.h asm/unistd.h')
diff --git a/lib/util/wscript_configure b/lib/util/wscript_configure
new file mode 100644
index 0000000000..c5744c5520
--- /dev/null
+++ b/lib/util/wscript_configure
@@ -0,0 +1,6 @@
+
+conf.CHECK_HEADERS('execinfo.h')
+
+# backtrace could be in libexecinfo or in libc
+conf.CHECK_FUNCS_IN('backtrace', 'execinfo')
+conf.CHECK_FUNCS('backtrace')
diff --git a/source4/wscript b/source4/wscript
index 0bbf09b2de..d04313155b 100644
--- a/source4/wscript
+++ b/source4/wscript
@@ -26,6 +26,7 @@ def configure(conf):
conf.sub_config('heimdal_build')
conf.sub_config('lib/tls')
conf.sub_config('ntvfs/sysdep')
+ conf.sub_config('../lib/util')
conf.DEFINE('CONFIG_H_IS_FROM_SAMBA', 1)
conf.ADD_EXTRA_INCLUDES('#source4 #lib #source4/lib #source4/include #lib/socket_wrapper #lib/talloc #lib/replace #lib/event')