summaryrefslogtreecommitdiff
path: root/source4/lib
diff options
context:
space:
mode:
authorStefan Metzmacher <metze@samba.org>2004-04-10 18:24:45 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 12:51:11 -0500
commit91b30df39bfaec8bfa32be40a13fd62008f66b9e (patch)
treed35bf8781df2daa60f2183c5dc9bc19dd2fdf112 /source4/lib
parentb65824f3f6aef15726604822f959bd9c1b52460a (diff)
downloadsamba-91b30df39bfaec8bfa32be40a13fd62008f66b9e.tar.gz
samba-91b30df39bfaec8bfa32be40a13fd62008f66b9e.tar.bz2
samba-91b30df39bfaec8bfa32be40a13fd62008f66b9e.zip
r147: - Remove dublicate ldap tests (richard the current test is in libads/config.m4 :-)
- Move sendfile check to ntvfs/config.m4 - Move comparison_fn_t check to build/m4/rewrite.m4 Please do not new tests to configure.in directly, please add them to the subsystems config.m4 file where they belong to or to build/m4/rewrite.m4 if you don't know where to put it for now Thanks I know samba4's build system is not completly rewritten. I have a lot of updatest in my local tree, but it's not complete yet when it's complete I'll write documentation for it:-) metze (This used to be commit 31c23f14d60a4aa41e0500e369f25ed6dc7ddae7)
Diffstat (limited to 'source4/lib')
-rw-r--r--source4/lib/ldb/config.m422
-rw-r--r--source4/lib/ldb/ldb_tdb/ldb_tdb.h4
2 files changed, 18 insertions, 8 deletions
diff --git a/source4/lib/ldb/config.m4 b/source4/lib/ldb/config.m4
index 6b097c34ec..6fdfcf526a 100644
--- a/source4/lib/ldb/config.m4
+++ b/source4/lib/ldb/config.m4
@@ -1,7 +1,17 @@
+
+SMB_MODULE(libldb_tdb,LIBLDB,STATIC,
+ [lib/ldb/ldb_tdb/ldb_tdb.o \
+ lib/ldb/ldb_tdb/ldb_pack.o \
+ lib/ldb/ldb_tdb/ldb_search.o \
+ lib/ldb/ldb_tdb/ldb_index.o \
+ lib/ldb/ldb_tdb/ldb_match.o])
+
+if test x"$with_ldap_support" = x"yes"; then
+ SMB_MODULE_DEFAULT(libldb_ldap,STATIC)
+fi
+SMB_MODULE(libldb_ldap,LIBLDB,NOT,[lib/ldb/ldb_ldap/ldb_ldap.o])
+
SMB_SUBSYSTEM(LIBLDB,[lib/ldb/common/ldb.o],
- [lib/ldb/ldb_tdb/ldb_pack.o \
- lib/ldb/common/ldb_ldif.o lib/ldb/ldb_tdb/ldb_search.o \
- lib/ldb/common/ldb_parse.o lib/ldb/ldb_tdb/ldb_tdb.o \
- lib/ldb/common/util.o lib/ldb/ldb_ldap/ldb_ldap.o \
- lib/ldb/ldb_tdb/ldb_index.o lib/ldb/ldb_tdb/ldb_match.o],
- lib/ldb/include/ldb.h)
+ [lib/ldb/common/ldb_ldif.o \
+ lib/ldb/common/ldb_parse.o \
+ lib/ldb/common/util.o])
diff --git a/source4/lib/ldb/ldb_tdb/ldb_tdb.h b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
index edf525f895..30afe223ea 100644
--- a/source4/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source4/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -5,7 +5,7 @@ struct ltdb_private {
unsigned int connect_flags;
};
-
+#ifdef STANDALONE
#define IVAL(p, ofs) (((unsigned *)((char *)(p) + (ofs)))[0])
#define SIVAL(p, ofs, v) do { IVAL(p, ofs) = (v); } while (0)
-
+#endif