pytalloc: allow for using a system libtalloc-dev with pytalloc

When we have a system talloc library, we still need to grab pytalloc.h
from lib/talloc. We don't want to just use -Ilib/talloc, as otherwise
we'll get the in-tree talloc.h which may not be compatible with the
system talloc.h

So we need to give the path to pytalloc.h

diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c
index ad595a10540e29bb6fa8ee76f07dc029e1e159c5..5ed88eca8897a5bcf677ddc90317b95c27e9f02b 100644 (file)
--- a/lib/talloc/pytalloc.c
+++ b/lib/talloc/pytalloc.c
@@ -20,7 +20,7 @@
 #include <Python.h>
 #include "replace.h"
 #include <talloc.h>
-#include <pytalloc.h>
+#include "pytalloc.h"
 
 /**
  * Simple dealloc for talloc-wrapping PyObjects

diff --git a/source4/auth/credentials/pycredentials.h b/source4/auth/credentials/pycredentials.h
index b1040c607943cd9b2f531a6382ce1e4a639356f8..6d03ca158b03f71f8764c125f3349d4d990ab007 100644 (file)
--- a/source4/auth/credentials/pycredentials.h
+++ b/source4/auth/credentials/pycredentials.h
@@ -20,7 +20,7 @@
 #define _PYCREDENTIALS_H_
 
 #include "auth/credentials/credentials.h"
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
 
 PyAPI_DATA(PyTypeObject) PyCredentials;
 PyAPI_DATA(PyTypeObject) PyCredentialCacheContainer;

diff --git a/source4/auth/gensec/pygensec.c b/source4/auth/gensec/pygensec.c
index 21acff81362af0edfb9d68ba6d20df8a4d57c5c0..381938c25a63124ecd8d74b8cdb949a49f34b79c 100644 (file)
--- a/source4/auth/gensec/pygensec.c
+++ b/source4/auth/gensec/pygensec.c
@@ -22,7 +22,7 @@
 #include "auth/gensec/gensec.h"
 #include "libcli/util/pyerrors.h"
 #include "scripting/python/modules.h"
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
 #include <tevent.h>
 
 static PyObject *py_get_name_by_authtype(PyObject *self, PyObject *args)

diff --git a/source4/auth/pyauth.h b/source4/auth/pyauth.h
index f5c63392ac35b1d44e488254d30de5863482b3ec..f3c9cea73ded52be9209c9b30942938ceed4a477 100644 (file)
--- a/source4/auth/pyauth.h
+++ b/source4/auth/pyauth.h
@@ -20,7 +20,7 @@
 #ifndef _PYAUTH_H_
 #define _PYAUTH_H_
 
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
 #include "auth/session.h"
 
 PyAPI_DATA(PyTypeObject) PyAuthSession;

diff --git a/source4/lib/registry/pyregistry.c b/source4/lib/registry/pyregistry.c
index 53580bd371f6843a4a64b0e36dfce0bfdc4937a0..d2302af6b9d5af2737adbc7d986dacbd173c5fc9 100644 (file)
--- a/source4/lib/registry/pyregistry.c
+++ b/source4/lib/registry/pyregistry.c
@@ -23,7 +23,7 @@
 #include "libcli/util/pyerrors.h"
 #include "lib/registry/registry.h"
 #include "scripting/python/modules.h" /* for py_iconv_convenience() */
-#include <pytalloc.h>
+#include "lib/talloc/pytalloc.h"
 #include "auth/credentials/pycredentials.h"
 #include "param/pyparam.h"
 

diff --git a/source4/param/pyparam.c b/source4/param/pyparam.c
index 4b534fbb417c6e380ca8cd62cc99cde457e6a0e6..40d25f7dcd76499789879b8f9b0328e47dacf746 100644 (file)
--- a/source4/param/pyparam.c
+++ b/source4/param/pyparam.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "param/param.h"
 #include "param/loadparm.h"
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
 
 /* There's no Py_ssize_t in 2.4, apparently */
 #if PY_MAJOR_VERSION == 2 && PY_MINOR_VERSION < 5

diff --git a/source4/param/pyparam_util.c b/source4/param/pyparam_util.c
index e5c416bf8437888ae460ce07636d2be1a42f75a2..cc84395ea016d94b44bc1343e64e0b8082214a52 100644 (file)
--- a/source4/param/pyparam_util.c
+++ b/source4/param/pyparam_util.c
@@ -21,7 +21,7 @@
 #include "includes.h"
 #include "param/param.h"
 #include "param/loadparm.h"
-#include "pytalloc.h"
+#include "lib/talloc/pytalloc.h"
 
 #define PyLoadparmContext_AsLoadparmContext(obj) py_talloc_get_type(obj, struct loadparm_context)