From 18989d6bac6db6c062c6d6f7398f48ec24ef8fad Mon Sep 17 00:00:00 2001
From: Simo Sorce <idra@samba.org>
Date: Sun, 11 Oct 2009 09:42:59 -0400
Subject: [PATCH] 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.
(cherry picked from commit dce488bc35af7ec137b657448708914edf5df706)
---
 lib/util/util_tdb.c               | 2 +-
 source3/lib/ldb/ldb_tdb/ldb_tdb.h | 6 ------
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index e107cbdc4ab..cda8dc75b20 100644
--- 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 486d948fa0e..caf8ba8d0c2 100644
--- 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 */
-- 
2.11.4.GIT