Fix builds with external talloc

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

diff --git a/lib/util/talloc_stack.h b/lib/util/talloc_stack.h
index bb22b8a0294aed21a94eb412ed143c18d88aebed..777671164d5039a4de46370d3a73fc821e7bbb5c 100644 (file)
--- a/lib/util/talloc_stack.h
+++ b/lib/util/talloc_stack.h
@@ -35,7 +35,7 @@
 #ifndef _TALLOC_STACK_H
 #define _TALLOC_STACK_H
 
-#include "../talloc/talloc.h"
+#include "talloc.h"
 
 /*
  * Create a new talloc stack frame.

diff --git a/nsswitch/libwbclient/wbclient.c b/nsswitch/libwbclient/wbclient.c
index f4620ff0025832cfa131fdd043f320eaacca3c9d..9a1e770690e736c78d746c6a153b296c04a1c602 100644 (file)
--- a/nsswitch/libwbclient/wbclient.c
+++ b/nsswitch/libwbclient/wbclient.c
@@ -23,8 +23,8 @@
 /* Required Headers */
 
 #include "replace.h"
-#include "lib/talloc/talloc.h"
-#include "lib/tevent/tevent.h"
+#include "talloc.h"
+#include "tevent.h"
 #include "libwbclient.h"
 
 /* From wb_common.c */

diff --git a/source3/include/includes.h b/source3/include/includes.h
index 453c8b3f29c9c88981a07af85d4c83a9f8bef8cf..b3446cbf65abe1787251cd1104327ac2ba28f2bc 100644 (file)
--- a/source3/include/includes.h
+++ b/source3/include/includes.h
@@ -621,7 +621,7 @@ struct smb_iconv_convenience *lp_iconv_convenience(void *lp_ctx);
 #include "tdb.h"
 #include "util_tdb.h"
 
-#include "../talloc/talloc.h"
+#include "talloc.h"
 
 #include "event.h"
 #include "../lib/util/tevent_unix.h"