diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-11-21 13:37:20 +0100 |
|---|---|---|
| committer | Stefan Metzmacher <metze@samba.org> | 2007-12-21 05:45:59 +0100 |
| commit | 91fe80a555e45560e77732fd20cdf5ea439eacfd (patch) | |
| tree | b7a206f553a7e18358e9ea5fc99d6fff6d3e41f9 | |
| parent | 29cf3a93cc8a67edcf307ba944bb3d5f90a3d55a (diff) | |
| download | samba-91fe80a555e45560e77732fd20cdf5ea439eacfd.tar.gz samba-91fe80a555e45560e77732fd20cdf5ea439eacfd.tar.bz2 samba-91fe80a555e45560e77732fd20cdf5ea439eacfd.zip | |
r26090: Make building tdb python bindings independent of use of external tdb.
(This used to be commit bfe54e2f197ea3ef760aeeef8c248ff71419ecd8)
| -rw-r--r-- | .bzrignore | 6 | ||||
| -rw-r--r-- | source4/configure.ac | 4 | ||||
| -rw-r--r-- | source4/lib/tdb/config.mk | 8 | ||||
| -rw-r--r-- | source4/lib/tdb/python.mk | 3 | ||||
| -rw-r--r-- | source4/samba4-skip | 1 |
5 files changed, 12 insertions, 10 deletions
diff --git a/.bzrignore b/.bzrignore index 5565c66ed0..1dca07b6c7 100644 --- a/.bzrignore +++ b/.bzrignore @@ -211,3 +211,9 @@ source/auth/credentials/credentials.py source/lib/ldb/ldb.py source/lib/registry/registry.py source/libcli/swig/libcli_nbt.py +source/lib/tdb/tdb.py +source/lib/tdb/tdb_wrap.c +source/librpc/rpc/dcerpc.py +source/scripting/python/misc.py +source/scripting/python/misc_wrap.c +source/auth/auth.py diff --git a/source4/configure.ac b/source4/configure.ac index 53fcc11804..f4fb671aed 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -36,7 +36,9 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.1.0, ) SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, - [], + [ + SMB_INCLUDE_MK(lib/tdb/python.mk) + ], [ m4_include(lib/tdb/libtdb.m4) SMB_INCLUDE_MK(lib/tdb/config.mk) diff --git a/source4/lib/tdb/config.mk b/source4/lib/tdb/config.mk index d0d1dfb492..c9e5a67d7b 100644 --- a/source4/lib/tdb/config.mk +++ b/source4/lib/tdb/config.mk @@ -57,11 +57,3 @@ PRIVATE_DEPENDENCIES = \ LIBTDB # End BINARY tdbbackup ################################################ - -####################### -# Start LIBRARY swig_tdb -[PYTHON::swig_tdb] -SWIG_FILE = tdb.i -PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG -# End LIBRARY swig_tdb -####################### diff --git a/source4/lib/tdb/python.mk b/source4/lib/tdb/python.mk new file mode 100644 index 0000000000..23b01c120c --- /dev/null +++ b/source4/lib/tdb/python.mk @@ -0,0 +1,3 @@ +[PYTHON::swig_tdb] +SWIG_FILE = tdb.i +PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG diff --git a/source4/samba4-skip b/source4/samba4-skip index 9f8b9b0eeb..76f07dea1a 100644 --- a/source4/samba4-skip +++ b/source4/samba4-skip @@ -52,4 +52,3 @@ NSS-TEST # Fails samba4.ldb.python # Fails to link properly samba4.credentials.python # Fails to link properly samba4.registry.python # Fails to link properly -samba4.tdb.python # Fails to link properly |