summaryrefslogtreecommitdiffstats
path: root/source4/lib/ldb
diff options
context:
space:
mode:
authorJelmer Vernooij <jelmer@samba.org>2006-04-27 16:05:05 +0000
committerGerald (Jerry) Carter <jerry@samba.org>2007-10-10 14:05:03 -0500
commit8d137d97858a618c8c5451bb7b11fb95990540c8 (patch)
tree19cb5130f64c02dba17cc53950233fc1c0e02974 /source4/lib/ldb
parent8ee028df8839323b4d7c9e8dbea21e9169629cf3 (diff)
downloadsamba-8d137d97858a618c8c5451bb7b11fb95990540c8.tar.gz
samba-8d137d97858a618c8c5451bb7b11fb95990540c8.tar.xz
samba-8d137d97858a618c8c5451bb7b11fb95990540c8.zip
r15295: Fix some dependencies
Move unistr-specific code to lib/charset/. Remove _m from some places where it's not needed. (This used to be commit 03224e112424968fc3f547c6159c7ccae2d1aa5b)
Diffstat (limited to 'source4/lib/ldb')
-rw-r--r--source4/lib/ldb/config.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index 6f6f441c7b2..00344f68f68 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -71,6 +71,7 @@ OBJ_FILES = \
################################################
# Start MODULE ldb_ildap
[MODULE::ldb_ildap]
+ENABLE = NO
SUBSYSTEM = ldb
INIT_FUNCTION = ldb_ildap_init
ALIASES = ldapi ldaps ldap
@@ -164,7 +165,7 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
# Start SUBSYSTEM LDBSAMBA
[SUBSYSTEM::LDBSAMBA]
PRIVATE_PROTO_HEADER = samba/ldif_handlers.h
-PUBLIC_DEPENDENCIES = LIB_SECURITY SAMDB
+PUBLIC_DEPENDENCIES = LIBSECURITY SAMDB
OBJ_FILES = \
samba/ldif_handlers.o
# End SUBSYSTEM LDBSAMBA
@@ -176,6 +177,7 @@ OBJ_FILES = \
OBJ_FILES= \
tools/cmdline.o
PUBLIC_DEPENDENCIES = ldb LIBSAMBA-UTIL LIBPOPT POPT_SAMBA POPT_CREDENTIALS
+PRIVATE_DEPENDENCIES = gensec
# End SUBSYSTEM LIBLDB_CMDLINE
################################################