Fix builds with external tdb

Make sure we do not reference our internal tdb directly.
Let configure define what tdb.h file to use so that builds that use an
extrenal tdb do not include 2 different versions of the tdb header.

diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index e107cbdc4abf7594e22cef7b96f23642d758da51..cda8dc75b20f85982d3b4a70e1614023ee10edbf 100644 (file)
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../tdb/include/tdb.h"
+#include "tdb.h"
 #include "../lib/util/util_tdb.h"
 
 /* these are little tdb utility functions that are meant to make

diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.h b/source3/lib/ldb/ldb_tdb/ldb_tdb.h
index 486d948fa0ed766974d93d809ccc47f6ecbc0d05..caf8ba8d0c2826cf395dc25dc5e57f6d3c854260 100644 (file)
--- a/source3/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -3,13 +3,7 @@
 #include "system/filesys.h"
 #endif
 
-#if (_SAMBA_BUILD_ >= 4)
-#include "lib/tdb/include/tdb.h"
-#elif defined(_SAMBA_BUILD_)
-#include "../tdb/include/tdb.h"
-#else
 #include "tdb.h"
-#endif
 
 /* this private structure is used by the ltdb backend in the
    ldb_context */