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/ntdb/libntdb.m4 | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'lib/ntdb') diff --git a/lib/ntdb/libntdb.m4 b/lib/ntdb/libntdb.m4 index b713ababfd..847dc6421a 100644 --- a/lib/ntdb/libntdb.m4 +++ b/lib/ntdb/libntdb.m4 @@ -12,7 +12,7 @@ done if test x"$ntdbdir" = "x"; then AC_MSG_ERROR([cannot find ntdb source in $ntdbpaths]) fi -NTDB_OBJ="check.o free.o hash.o io.o lock.o ntdb.o open.o pyntdb.o summary.o transaction.o traverse.o" +NTDB_OBJ="check.o free.o hash.o io.o lock.o ntdb.o open.o summary.o transaction.o traverse.o" AC_SUBST(NTDB_OBJ) AC_SUBST(LIBREPLACEOBJ) AC_SUBST(CCAN_OBJ) -- cgit