Use <tdb.h> to include tdb, so the system include file gets used when building against

system tdb.

diff --git a/source4/cluster/local.c b/source4/cluster/local.c
index 2d910d1e28fb25e9c4f034c5be158577d10fdd52..a93b0a65ede864f8ca24136d3e31c97e6c70e45a 100644 (file)
--- a/source4/cluster/local.c
+++ b/source4/cluster/local.c
@@ -22,7 +22,7 @@
 #include "includes.h"
 #include "cluster/cluster.h"
 #include "cluster/cluster_private.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "tdb_wrap.h"
 #include "system/filesys.h"
 #include "param/param.h"

diff --git a/source4/lib/ldb-samba/ldb_wrap.c b/source4/lib/ldb-samba/ldb_wrap.c
index e3e6dcecfa30a21debdb7b5e4f855c85ba301c86..7dcf514e23b2e64aa342c2737ccbb6fa0979f7d5 100644 (file)
--- a/source4/lib/ldb-samba/ldb_wrap.c
+++ b/source4/lib/ldb-samba/ldb_wrap.c
@@ -35,7 +35,7 @@
 #include "dsdb/samdb/samdb.h"
 #include "param/param.h"
 #include "../lib/util/dlinklist.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 
 /*
   this is used to catch debug messages from ldb

diff --git a/source4/lib/messaging/messaging.c b/source4/lib/messaging/messaging.c
index c61bb7afca11f57ad24e034da93dad70cacd38c9..f9d63203f212f7858c43428340e1a54eb94ff8e9 100644 (file)
--- a/source4/lib/messaging/messaging.c
+++ b/source4/lib/messaging/messaging.c
@@ -30,7 +30,7 @@
 #include "tdb_wrap.h"
 #include "../lib/util/unix_privs.h"
 #include "librpc/rpc/dcerpc.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "../lib/util/util_tdb.h"
 #include "cluster/cluster.h"
 #include "../lib/util/tevent_ntstatus.h"

diff --git a/source4/lib/tdb_wrap.c b/source4/lib/tdb_wrap.c
index da27803b06006b8c7c0c514957003e1e54dbbb7b..e08e4f73fc9dab9161017f8e7538d78302f712f1 100644 (file)
--- a/source4/lib/tdb_wrap.c
+++ b/source4/lib/tdb_wrap.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "../lib/util/dlinklist.h"
 #include "tdb_wrap.h"
 #include "tdb.h"

diff --git a/source4/lib/tdb_wrap.h b/source4/lib/tdb_wrap.h
index d49fafbf0ca028353a15d43f45e5e470ae0aebe1..94035c1bea67cd67c58b6ae586e240d9d201e4f0 100644 (file)
--- a/source4/lib/tdb_wrap.h
+++ b/source4/lib/tdb_wrap.h
@@ -29,7 +29,7 @@
 #ifndef _TDB_WRAP_H_
 #define _TDB_WRAP_H_
 
-#include "../lib/tdb/include/tdb.h"
+#include <tdb.h>
 
 struct tdb_wrap {
        struct tdb_context *tdb;

diff --git a/source4/ntvfs/common/brlock.c b/source4/ntvfs/common/brlock.c
index 154494e4affaf15e0cce0f48f0ef8dbf271d7710..94041d20141a94bb372853b2f71e5ba577a50866 100644 (file)
--- a/source4/ntvfs/common/brlock.c
+++ b/source4/ntvfs/common/brlock.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "messaging/messaging.h"
 #include "lib/messaging/irpc.h"
 #include "libcli/libcli.h"

diff --git a/source4/ntvfs/common/brlock_tdb.c b/source4/ntvfs/common/brlock_tdb.c
index 07e7c1aa5ce105a50f45678632f3bdde7cf2187c..35d4c27d0f0aebed9cf1b6775a82ce7e4a4e8d9b 100644 (file)
--- a/source4/ntvfs/common/brlock_tdb.c
+++ b/source4/ntvfs/common/brlock_tdb.c
@@ -26,7 +26,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "messaging/messaging.h"
 #include "tdb_wrap.h"
 #include "lib/messaging/irpc.h"

diff --git a/source4/ntvfs/common/notify.c b/source4/ntvfs/common/notify.c
index e369404e85f1edf5bc991d74aca0a6978ffdd820..0b5f91bfe19cd20e51a49325227ab96742b993d2 100644 (file)
--- a/source4/ntvfs/common/notify.c
+++ b/source4/ntvfs/common/notify.c
@@ -25,7 +25,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "../lib/util/util_tdb.h"
 #include "messaging/messaging.h"
 #include "tdb_wrap.h"

diff --git a/source4/ntvfs/common/opendb_tdb.c b/source4/ntvfs/common/opendb_tdb.c
index 944ec866314fb0ea4c6d7eb6315b489053d90cb2..881fd5b57a4d7addb8057af7adde6cf7417af138 100644 (file)
--- a/source4/ntvfs/common/opendb_tdb.c
+++ b/source4/ntvfs/common/opendb_tdb.c
@@ -40,7 +40,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "messaging/messaging.h"
 #include "tdb_wrap.h"
 #include "lib/messaging/irpc.h"

diff --git a/source4/ntvfs/posix/vfs_posix.c b/source4/ntvfs/posix/vfs_posix.c
index 1e0efcddc8481c34ac2d7db1c90dc7f7f9ab7ea2..ca1d1633279e22455f95d6727c3d923c74b46eb6 100644 (file)
--- a/source4/ntvfs/posix/vfs_posix.c
+++ b/source4/ntvfs/posix/vfs_posix.c
@@ -26,7 +26,7 @@
 #include "includes.h"
 #include "vfs_posix.h"
 #include "librpc/gen_ndr/security.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "tdb_wrap.h"
 #include "libcli/security/security.h"
 #include "lib/events/events.h"

diff --git a/source4/ntvfs/posix/xattr_tdb.c b/source4/ntvfs/posix/xattr_tdb.c
index 69324a3498b39a721d4b7e38756c731195e470e0..de7c83677a4891a107874dfdd9d455d1dcfde51b 100644 (file)
--- a/source4/ntvfs/posix/xattr_tdb.c
+++ b/source4/ntvfs/posix/xattr_tdb.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "tdb_wrap.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "vfs_posix.h"
 
 #define XATTR_LIST_ATTR ".xattr_list"

diff --git a/source4/torture/basic/mangle_test.c b/source4/torture/basic/mangle_test.c
index 0f38c9ff03d50e35605799f20c045272ee106c7f..1305634460d1756d39e2d06583adbf0e37441aba 100644 (file)
--- a/source4/torture/basic/mangle_test.c
+++ b/source4/torture/basic/mangle_test.c
@@ -20,7 +20,7 @@
 #include "includes.h"
 #include "system/filesys.h"
 #include "system/dir.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include "../lib/util/util_tdb.h"
 #include "libcli/libcli.h"
 #include "torture/util.h"

diff --git a/source4/torture/local/dbspeed.c b/source4/torture/local/dbspeed.c
index 9d7c551db6733e99ba461e385d683669fece6d4f..8768b349effd2f8e11942d416eef54b8855bfc53 100644 (file)
--- a/source4/torture/local/dbspeed.c
+++ b/source4/torture/local/dbspeed.c
@@ -21,7 +21,7 @@
 
 #include "includes.h"
 #include "system/filesys.h"
-#include "../tdb/include/tdb.h"
+#include <tdb.h>
 #include <ldb.h>
 #include <ldb_errors.h>
 #include "ldb_wrap.h"