diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-19 00:06:14 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-19 00:06:14 +0200 |
| commit | db0abee678f7b079b32d08334682fcee442e206b (patch) | |
| tree | d168cc6be50028944d315551bb58cb5e3b4018ca /source4/scripting | |
| parent | 21897a0539e31c81bb7105fc5da7829a7d58f41e (diff) | |
| parent | ba5fe7122586d8b382bf78f1e1cb5dbe4293c27b (diff) | |
| download | samba-db0abee678f7b079b32d08334682fcee442e206b.tar.gz samba-db0abee678f7b079b32d08334682fcee442e206b.tar.bz2 samba-db0abee678f7b079b32d08334682fcee442e206b.zip | |
Merge branch 'master' of ssh://git.samba.org/data/git/samba into noejs
Diffstat (limited to 'source4/scripting')
| -rw-r--r-- | source4/scripting/python/config.m4 | 2 | ||||
| -rw-r--r-- | source4/scripting/python/misc.i | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/source4/scripting/python/config.m4 b/source4/scripting/python/config.m4 index aaf32c5e4e..843c3f7873 100644 --- a/source4/scripting/python/config.m4 +++ b/source4/scripting/python/config.m4 @@ -5,7 +5,7 @@ AC_ARG_VAR([PYTHON_VERSION],[The installed Python will be appended to the Python interpreter canonical name.]) -AC_PROG_SWIG(1.3.35) +AC_PROG_SWIG(1.3.36) AC_PATH_PROG([PYTHON],[python[$PYTHON_VERSION]]) if test -z "$PYTHON"; then diff --git a/source4/scripting/python/misc.i b/source4/scripting/python/misc.i index 81be7d5c16..f40e88c6cd 100644 --- a/source4/scripting/python/misc.i +++ b/source4/scripting/python/misc.i @@ -31,7 +31,7 @@ %import "stdint.i" %include "exception.i" -%import "../../lib/talloc/talloc.i" +%import "../../../lib/talloc/talloc.i" %import "../../lib/ldb/ldb.i" %import "../../auth/credentials/credentials.i" %import "../../param/param.i" |