Author: jelmer Date: 2007-11-21 13:37:20 +0000 (Wed, 21 Nov 2007) New Revision: 26090
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=26090 Log: Make building tdb python bindings independent of use of external tdb. Added: branches/SAMBA_4_0/source/lib/tdb/python.mk Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/.bzrignore branches/SAMBA_4_0/source/configure.ac branches/SAMBA_4_0/source/lib/tdb/config.mk branches/SAMBA_4_0/source/samba4-skip Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:revision-info ...skipped... Name: bzr:file-ids ...skipped... Name: bzr:revision-id:v3-trunk0 ...skipped... Modified: branches/SAMBA_4_0/.bzrignore =================================================================== --- branches/SAMBA_4_0/.bzrignore 2007-11-21 13:22:54 UTC (rev 26089) +++ branches/SAMBA_4_0/.bzrignore 2007-11-21 13:37:20 UTC (rev 26090) @@ -211,3 +211,9 @@ 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 Modified: branches/SAMBA_4_0/source/configure.ac =================================================================== --- branches/SAMBA_4_0/source/configure.ac 2007-11-21 13:22:54 UTC (rev 26089) +++ branches/SAMBA_4_0/source/configure.ac 2007-11-21 13:37:20 UTC (rev 26090) @@ -36,8 +36,10 @@ ) 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) ] Modified: branches/SAMBA_4_0/source/lib/tdb/config.mk =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/config.mk 2007-11-21 13:22:54 UTC (rev 26089) +++ branches/SAMBA_4_0/source/lib/tdb/config.mk 2007-11-21 13:37:20 UTC (rev 26090) @@ -57,11 +57,3 @@ LIBTDB # End BINARY tdbbackup ################################################ - -####################### -# Start LIBRARY swig_tdb -[PYTHON::swig_tdb] -SWIG_FILE = tdb.i -PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG -# End LIBRARY swig_tdb -####################### Added: branches/SAMBA_4_0/source/lib/tdb/python.mk =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/python.mk 2007-11-21 13:22:54 UTC (rev 26089) +++ branches/SAMBA_4_0/source/lib/tdb/python.mk 2007-11-21 13:37:20 UTC (rev 26090) @@ -0,0 +1,3 @@ +[PYTHON::swig_tdb] +SWIG_FILE = tdb.i +PUBLIC_DEPENDENCIES = LIBTDB DYNCONFIG Modified: branches/SAMBA_4_0/source/samba4-skip =================================================================== --- branches/SAMBA_4_0/source/samba4-skip 2007-11-21 13:22:54 UTC (rev 26089) +++ branches/SAMBA_4_0/source/samba4-skip 2007-11-21 13:37:20 UTC (rev 26090) @@ -52,4 +52,3 @@ 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