r26090: Make building tdb python bindings independent of use of external tdb.

(This used to be commit bfe54e2f197ea3ef760aeeef8c248ff71419ecd8)

diff --git a/.bzrignore b/.bzrignore
index 5565c66ed020c99a76881feeb63179f916ed83e4..1dca07b6c7713c7c5a9377c8cf42dd3e1e99af7f 100644 (file)
--- 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 53fcc11804892bef6b86ba17ffed81868b8a8bea..f4fb671aed7bca0ecd9656de8832c897b6dd26fa 100644 (file)
--- 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 d0d1dfb4920185ff9958ce414094c3956fdf7720..c9e5a67d7bae11e58b65ade038537eaae3cfa05c 100644 (file)
--- 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 (file)
index 0000000..23b01c1
--- /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 9f8b9b0eeb7ee3d5f52048995bae6d942398c1a7..76f07dea1a120f75f89249dc1c77f4779ca49fdf 100644 (file)
--- 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