From: Jelmer Vernooij Date: Wed, 21 Nov 2007 12:37:20 +0000 (+0100) Subject: r26090: Make building tdb python bindings independent of use of external tdb. X-Git-Tag: samba-4.0.0alpha2~268 X-Git-Url: http://git.samba.org/samba.git/?p=ira%2Fwip.git;a=commitdiff_plain;h=bfe54e2f197ea3ef760aeeef8c248ff71419ecd8;hp=4e7709379de2fb9bf1eafd9ee9cbe10a0e6df51e r26090: Make building tdb python bindings independent of use of external tdb. --- diff --git a/.bzrignore b/.bzrignore index 5565c66ed02..1dca07b6c77 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/source/configure.ac b/source/configure.ac index 53fcc118048..f4fb671aed7 100644 --- a/source/configure.ac +++ b/source/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/source/lib/tdb/config.mk b/source/lib/tdb/config.mk index d0d1dfb4920..c9e5a67d7ba 100644 --- a/source/lib/tdb/config.mk +++ b/source/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/source/lib/tdb/python.mk b/source/lib/tdb/python.mk new file mode 100644 index 00000000000..23b01c120c6 --- /dev/null +++ b/source/lib/tdb/python.mk @@ -0,0 +1,3 @@ +[PYTHON::swig_tdb] +SWIG_FILE = tdb.i +PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG diff --git a/source/samba4-skip b/source/samba4-skip index 9f8b9b0eeb7..76f07dea1a1 100644 --- a/source/samba4-skip +++ b/source/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