summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndreas Schneider <asn@samba.org>2012-02-06 12:47:16 +0100
committerAndreas Schneider <asn@samba.org>2012-02-07 11:11:47 +0100
commitd03ef6ad91c3be0179191e9c7bf73747acf928ba (patch)
tree766eac7b59eff5cc336e4247ad02c3d3267f0faf
parentf2903e0c4f9fc3931415144e72b6b898c4fdbf49 (diff)
downloadsamba-d03ef6ad91c3be0179191e9c7bf73747acf928ba.tar.gz
samba-d03ef6ad91c3be0179191e9c7bf73747acf928ba.tar.bz2
samba-d03ef6ad91c3be0179191e9c7bf73747acf928ba.zip
s3-waf: Link against tdb_compat instead of tdb.
-rw-r--r--source3/passdb/wscript_build4
-rwxr-xr-xsource3/wscript_build10
2 files changed, 7 insertions, 7 deletions
diff --git a/source3/passdb/wscript_build b/source3/passdb/wscript_build
index a8b79fd062..49c60c1ce3 100644
--- a/source3/passdb/wscript_build
+++ b/source3/passdb/wscript_build
@@ -9,7 +9,7 @@ PDB_WBC_SAM_SRC = 'pdb_wbc_sam.c'
bld.SAMBA3_MODULE('pdb_tdbsam',
subsystem='pdb',
source=PDB_TDBSAM_SRC,
- deps='samba-util tdb',
+ deps='samba-util tdb_compat',
init_function='',
internal_module=bld.SAMBA3_IS_STATIC_MODULE('pdb_tdbsam'),
enabled=bld.SAMBA3_IS_ENABLED_MODULE('pdb_tdbsam'))
@@ -57,6 +57,6 @@ bld.SAMBA3_MODULE('pdb_samba4',
bld.SAMBA3_PYTHON('pypassdb',
source='py_passdb.c',
deps='pdb',
- public_deps='samba-util tdb talloc pyrpc_util',
+ public_deps='samba-util tdb_compat talloc pyrpc_util',
realname='samba/samba3/passdb.so'
)
diff --git a/source3/wscript_build b/source3/wscript_build
index b6ceb180fd..cb16ef2262 100755
--- a/source3/wscript_build
+++ b/source3/wscript_build
@@ -983,12 +983,12 @@ bld.SAMBA3_SUBSYSTEM('PROFILE',
bld.SAMBA3_SUBSYSTEM('PRINTBASE',
source=PRINTBASE_SRC,
- deps='samba-util tdb',
+ deps='samba-util tdb_compat',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PRINTBACKEND',
source=PRINTBACKEND_SRC,
- deps='PRINTBASE LIBADS_PRINTER tdb printing_migrate',
+ deps='PRINTBASE LIBADS_PRINTER tdb_compat printing_migrate',
vars=locals())
bld.SAMBA3_LIBRARY('printing_migrate',
@@ -999,7 +999,7 @@ bld.SAMBA3_LIBRARY('printing_migrate',
bld.SAMBA3_SUBSYSTEM('PRINTING',
source=PRINTING_SRC,
- deps='NDR_PRINTCAP tdb cups',
+ deps='NDR_PRINTCAP tdb_compat cups',
vars=locals())
bld.SAMBA3_SUBSYSTEM('PASSWD_UTIL',
@@ -1036,7 +1036,7 @@ bld.SAMBA3_SUBSYSTEM('LIBNET_SAMSYNC',
bld.SAMBA3_SUBSYSTEM('LIBEVENTLOG',
source=LIB_EVENTLOG_SRC,
- deps='NDR_EVENTLOG tdb',
+ deps='NDR_EVENTLOG tdb_compat',
vars=locals())
bld.SAMBA3_SUBSYSTEM('LIBNMB',
@@ -1068,7 +1068,7 @@ bld.SAMBA3_SUBSYSTEM('SAMBA_VERSION',
bld.SAMBA3_SUBSYSTEM('SLCACHE',
source=SLCACHE_SRC,
- deps='samba-util tdb',
+ deps='samba-util tdb_compat',
vars=locals())
bld.SAMBA3_SUBSYSTEM('DCUTIL',