diff options
| author | Rusty Russell <rusty@rustcorp.com.au> | 2013-04-11 17:12:08 +0930 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2013-04-12 14:59:00 -0700 |
| commit | 5b15d107951d353eb4f055a62cf48a8226e8e6a6 (patch) | |
| tree | b062fb5f6bc366af747e88f3faa7e7cf12f4febd /lib | |
| parent | 7a4dd845958f1411daa8031ca242987001ab2f26 (diff) | |
| download | samba-5b15d107951d353eb4f055a62cf48a8226e8e6a6.tar.gz samba-5b15d107951d353eb4f055a62cf48a8226e8e6a6.tar.bz2 samba-5b15d107951d353eb4f055a62cf48a8226e8e6a6.zip | |
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 <rusty@rustcorp.com.au>
Reviewed-by: Jeremy Allison <jra@samba.org>
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/ccan/libccan.m4 | 2 | ||||
| -rw-r--r-- | lib/ntdb/libntdb.m4 | 2 |
2 files changed, 2 insertions, 2 deletions
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/module/...>. -CCAN_CFLAGS="-I$ccandir/.." +CCAN_CFLAGS="-I$ccandir/.. -DHAVE_CCAN" AC_SUBST(CCAN_CFLAGS) # All the configuration checks. Regrettably, the __attribute__ checks will 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) |