s3-build: make sure we pick up system tdb and talloc via #include.

Guenther

Autobuild-User: Günther Deschner <gd@samba.org>
Autobuild-Date: Thu Apr 14 12:56:28 CEST 2011 on sn-devel-104

diff --git a/source3/configure.in b/source3/configure.in
index f0d54ccc3d6f4aa4b2d2f1135b6b30ad64d0d438..086e0442a07a8e0a42d037585b8090de3fa7d34e 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -2151,7 +2151,7 @@ then
        AC_SUBST(TDBTORTURE)
        ac_cv_have_tdb_err_nesting=yes
 else
-       AC_TRY_COMPILE([#include "tdb.h"],
+       AC_TRY_COMPILE([#include <tdb.h>],
                       [enum TDB_ERROR err = TDB_ERR_NESTING],
                       ac_cv_have_tdb_err_nesting=yes,
                       ac_cv_have_tdb_err_nesting=no)

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 452464b1ce4917f0e5a8902e71a84ed7c4e367c7..1dac73a168e318009e4b5e7748d3cad8cbb09e1d 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -515,10 +515,10 @@ typedef char fstring[FSTRING_LEN];
 #include "../lib/util/attr.h"
 #include "../lib/util/tsort.h"
 #include "../lib/util/dlinklist.h"
-#include "tdb.h"
+#include <tdb.h>
 #include "util_tdb.h"
 
-#include "talloc.h"
+#include <talloc.h>
 
 #include "event.h"
 #include "../lib/util/tevent_unix.h"

diff --git a/source3/include/util_tdb.h b/source3/include/util_tdb.h
index 9666fc979a7153d3c4ebedd038264bedcde289ac..3bdb6977d87f7a8e0b830615694d3bab0cbad78a 100644 (file)
--- a/source3/include/util_tdb.h
+++ b/source3/include/util_tdb.h
@@ -20,9 +20,9 @@
 #ifndef __TDBUTIL_H__
 #define __TDBUTIL_H__
 
-#include "tdb.h"
+#include <tdb.h>
 
-#include "talloc.h" /* for tdb_wrap_open() */
+#include <talloc.h> /* for tdb_wrap_open() */
 #include "../libcli/util/ntstatus.h" /* for map_nt_error_from_tdb() */
 #include "../../lib/util/util_tdb.h"
 

diff --git a/source3/lib/tdb_validate.h b/source3/lib/tdb_validate.h
index 9eda79d7db1eecd8d2ae3704c2e3868295461943..3e7c20d04cffaa2127dadc22cbed0e63440d0734 100644 (file)
--- a/source3/lib/tdb_validate.h
+++ b/source3/lib/tdb_validate.h
@@ -23,7 +23,7 @@
 #define __TDB_VALIDATE_H__
 
 #include "lib/replace/replace.h"
-#include "tdb.h"
+#include <tdb.h>
 
 /**
  * Flag field for keeping track of the status of a validation.