[PATCH] "proper" ldb independant build fix

[Stewart Smith]

this time, i actually made sure the make fully succeeded, so here's the
patch that makes things go.


Index: tools/ldbtest.c
===================================================================
--- tools/ldbtest.c	(revision 989)
+++ tools/ldbtest.c	(working copy)
@@ -125,7 +125,7 @@
 		free(name);
 		free(msg.dn);
 		free(vals[1][0].data);
-		ldb_free(ldb, vals[2][0].data);
+		ldb_set_alloc(ldb, vals[2][0].data,NULL);
 		free(vals[3][0].data);
 		free(vals[4][0].data);
 	}
Index: include/includes.h
===================================================================
--- include/includes.h	(revision 989)
+++ include/includes.h	(working copy)
@@ -18,5 +18,4 @@
 #include <sys/time.h>
 #include <time.h>
 #include "ldb.h"
-#include "tdb/tdb.h"
-#include "proto.h"
+#include "tdb.h"
Index: Makefile.ldb
===================================================================
--- Makefile.ldb	(revision 989)
+++ Makefile.ldb	(working copy)
@@ -9,12 +9,12 @@
 LDB_LDAP_OBJ=ldb_ldap/ldb_ldap.o
 endif
 
-TDBDIR=../tdb
+TDBDIR=../tdb/
 
-CFLAGS=-Wall -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -g -Iinclude -I. -I.. -DSTANDALONE=1 -DUSE_MMAP=1 $(LDAP_FLAGS)
+CFLAGS=-Wall -Wall -Wshadow -Wstrict-prototypes -Wpointer-arith -Wcast-qual -Wcast-align -Wwrite-strings -g -Iinclude -I. -I.. -I$(TDBDIR)/include -DSTANDALONE=1 -DUSE_MMAP=1 $(LDAP_FLAGS)
 LIB_FLAGS=-Llib -lldb $(LDAP_LIBS)
 
-TDB_OBJ=$(TDBDIR)/tdb.o $(TDBDIR)/spinlock.o
+TDB_OBJ=$(TDBDIR)/common/tdb.o $(TDBDIR)/common/spinlock.o
 
 LDB_TDB_OBJ=ldb_tdb/ldb_match.o ldb_tdb/ldb_tdb.o \
 	ldb_tdb/ldb_pack.o ldb_tdb/ldb_search.o ldb_tdb/ldb_index.o \