summaryrefslogtreecommitdiff
path: root/lib/ccan
diff options
context:
space:
mode:
authorRusty Russell <rusty@rustcorp.com.au>2012-06-18 20:06:45 +0930
committerRusty Russell <rusty@rustcorp.com.au>2012-06-19 05:38:05 +0200
commit5bad913938daca4ae3020653690701db83826954 (patch)
treef19f94394b0f944056dc94f3cb42a1a7faf657de /lib/ccan
parent85b8439d4a4a8769a524fab2c78e46eb13b04c76 (diff)
downloadsamba-5bad913938daca4ae3020653690701db83826954.tar.gz
samba-5bad913938daca4ae3020653690701db83826954.tar.bz2
samba-5bad913938daca4ae3020653690701db83826954.zip
ccan: check for err.h ourselves
Heimdal does this, but that doesn't help the autoconf build or the standalone libntdb build. Signed-off-by: Rusty Russell <rusty@rustcorp.com.au>
Diffstat (limited to 'lib/ccan')
-rw-r--r--lib/ccan/libccan.m42
-rw-r--r--lib/ccan/wscript1
2 files changed, 3 insertions, 0 deletions
diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4
index 3b71d7b023..0d391ad961 100644
--- a/lib/ccan/libccan.m4
+++ b/lib/ccan/libccan.m4
@@ -21,6 +21,8 @@ AC_SUBST(CCAN_CFLAGS)
# All the configuration checks. Regrettably, the __attribute__ checks will
# give false positives on old GCCs, since they just cause warnings. But that's
# fairly harmless.
+AC_CHECK_HEADERS(err.h)
+
AC_CACHE_CHECK([whether we can compile with __attribute__((cold))],
samba_cv_attribute_cold,
[
diff --git a/lib/ccan/wscript b/lib/ccan/wscript
index 8d5782af8b..c1dae41611 100644
--- a/lib/ccan/wscript
+++ b/lib/ccan/wscript
@@ -4,6 +4,7 @@ import Logs, sys, Options
def configure(conf):
conf.DEFINE('HAVE_CCAN', 1)
+ conf.CHECK_HEADERS('err.h')
# FIXME: if they don't have -Werror, these will all fail. But they
# probably will anyway...
conf.CHECK_CODE('int __attribute__((cold)) func(int x) { return x; }',