From 5b15d107951d353eb4f055a62cf48a8226e8e6a6 Mon Sep 17 00:00:00 2001 From: Rusty Russell Date: Thu, 11 Apr 2013 17:12:08 +0930 Subject: autoconf: build in NTDB. I previously added -DDISABLE_NTDB to FLAGS, but lib/param/util.c doesn't seem to be compiled with that flag, so it's really not a good solution. So instead, compile in ntdb for the autoconf build. This means: 1) Add -DHAVE_CCAN to cflags. 2) Remove pyntdb from autoconf objects (which is what tdb does) 3) Remove -DDISABLE_NTDB 4) Add ntdb utility objects 5) Link in ntdb everywhere we link in tdb. Signed-off-by: Rusty Russell Reviewed-by: Jeremy Allison --- lib/ccan/libccan.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ccan/libccan.m4') diff --git a/lib/ccan/libccan.m4 b/lib/ccan/libccan.m4 index cda1353de6..c573215070 100644 --- a/lib/ccan/libccan.m4 +++ b/lib/ccan/libccan.m4 @@ -15,7 +15,7 @@ CCAN_OBJ="$ccandir/hash/hash.o $ccandir/htable/htable.o $ccandir/ilog/ilog.o $cc AC_SUBST(CCAN_OBJ) # Preferred method for including ccan modules is #include . -CCAN_CFLAGS="-I$ccandir/.." +CCAN_CFLAGS="-I$ccandir/.. -DHAVE_CCAN" AC_SUBST(CCAN_CFLAGS) # All the configuration checks. Regrettably, the __attribute__ checks will -- cgit