diff options
| author | Andrew Tridgell <tridge@samba.org> | 2010-03-29 08:35:30 +1100 |
|---|---|---|
| committer | Andrew Tridgell <tridge@samba.org> | 2010-03-29 21:34:29 +1100 |
| commit | 7ed349caceed2524d897d957cee98ad1cdc4704c (patch) | |
| tree | 1c82cc0261e6083e6f16a813483c7c7712fdf8c1 | |
| parent | 08faa3a43c26f8cc637969d2b216f2efea9099d9 (diff) | |
| download | samba-7ed349caceed2524d897d957cee98ad1cdc4704c.tar.gz samba-7ed349caceed2524d897d957cee98ad1cdc4704c.tar.bz2 samba-7ed349caceed2524d897d957cee98ad1cdc4704c.zip | |
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
| -rw-r--r-- | lib/talloc/pytalloc.c | 2 | ||||
| -rw-r--r-- | source4/auth/credentials/pycredentials.h | 2 | ||||
| -rw-r--r-- | source4/auth/gensec/pygensec.c | 2 | ||||
| -rw-r--r-- | source4/auth/pyauth.h | 2 | ||||
| -rw-r--r-- | source4/lib/registry/pyregistry.c | 2 | ||||
| -rw-r--r-- | source4/param/pyparam.c | 2 | ||||
| -rw-r--r-- | source4/param/pyparam_util.c | 2 |
7 files changed, 7 insertions, 7 deletions
diff --git a/lib/talloc/pytalloc.c b/lib/talloc/pytalloc.c index ad595a1054..5ed88eca88 100644 --- 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 b1040c6079..6d03ca158b 100644 --- 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 21acff8136..381938c25a 100644 --- 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 f5c63392ac..f3c9cea73d 100644 --- 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 53580bd371..d2302af6b9 100644 --- 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 4b534fbb41..40d25f7dcd 100644 --- 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 e5c416bf84..cc84395ea0 100644 --- 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) |