diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-05-11 02:15:32 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-05-11 02:15:32 +0200 |
| commit | b48e2e4c4103e7b6065bce61af39f09ebfb83af2 (patch) | |
| tree | 2cd6dea88a69938ffe845905980863d87312bc0f /source4 | |
| parent | 7c7de11f20c5330c40c24d341056fb92806bbf37 (diff) | |
| download | samba-b48e2e4c4103e7b6065bce61af39f09ebfb83af2.tar.gz samba-b48e2e4c4103e7b6065bce61af39f09ebfb83af2.tar.bz2 samba-b48e2e4c4103e7b6065bce61af39f09ebfb83af2.zip | |
Merge ldb_map into LIBLDB.
(This used to be commit 4d7925f953bc9d1fcffb4a4dd268b763c18ceae6)
Diffstat (limited to 'source4')
| -rw-r--r-- | source4/configure.ac | 1 | ||||
| -rw-r--r-- | source4/dsdb/samdb/ldb_modules/config.mk | 4 | ||||
| -rw-r--r-- | source4/lib/ldb/config.mk | 12 |
3 files changed, 5 insertions, 12 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index a845082fbf..d07632a291 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -59,7 +59,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBLDB, ldb >= 0.9.1, [ SMB_INCLUDE_MK(lib/ldb/ldb_ildap/config.mk) SMB_INCLUDE_MK(lib/ldb/tools/config.mk) - SMB_SUBSYSTEM(ldb_map, [], [LIBLDB]) define_ldb_modulesdir=no ], [ diff --git a/source4/dsdb/samdb/ldb_modules/config.mk b/source4/dsdb/samdb/ldb_modules/config.mk index 5161d0fcf8..a5f5bc4895 100644 --- a/source4/dsdb/samdb/ldb_modules/config.mk +++ b/source4/dsdb/samdb/ldb_modules/config.mk @@ -96,7 +96,7 @@ ldb_samldb_OBJ_FILES = \ SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = LDB_MODULE(samba3sam) -PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map SMBPASSWD NSS_WRAPPER LIBSECURITY \ +PRIVATE_DEPENDENCIES = LIBTALLOC SMBPASSWD NSS_WRAPPER LIBSECURITY \ NDR_SECURITY # End MODULE ldb_samldb ################################################ @@ -110,7 +110,7 @@ ldb_samba3sam_OBJ_FILES = \ SUBSYSTEM = LIBLDB OUTPUT_TYPE = SHARED_LIBRARY INIT_FUNCTION = LDB_MODULE(simple_ldap_map) -PRIVATE_DEPENDENCIES = LIBTALLOC ldb_map LIBNDR NDR_MISC +PRIVATE_DEPENDENCIES = LIBTALLOC LIBNDR NDR_MISC ENABLE = YES ALIASES = entryuuid nsuniqueid # End MODULE ldb_entryuuid diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk index 23e2ef71dd..e8852980f6 100644 --- a/source4/lib/ldb/config.mk +++ b/source4/lib/ldb/config.mk @@ -70,16 +70,10 @@ INIT_FUNCTION = LDB_MODULE(rdn_name) ldb_rdn_name_OBJ_FILES = lib/ldb/modules/rdn_name.o -################################################ -# Start MODULE ldb_map -[SUBSYSTEM::ldb_map] -PRIVATE_DEPENDENCIES = LIBTALLOC -CFLAGS = -Ilib/ldb/include -Ilib/ldb/ldb_map -# End MODULE ldb_map -################################################ - ldb_map_OBJ_FILES = $(addprefix lib/ldb/ldb_map/, ldb_map_inbound.o ldb_map_outbound.o ldb_map.o) +$(ldb_map_OBJ_FILES): CFLAGS+=-Ilib/ldb/ldb_map + ################################################ # Start MODULE ldb_skel [MODULE::ldb_skel] @@ -134,7 +128,7 @@ PC_FILES += $(ldbdir)/ldb.pc LIBLDB_VERSION = 0.0.1 LIBLDB_SOVERSION = 0 -LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) +LIBLDB_OBJ_FILES = $(addprefix lib/ldb/common/, ldb.o ldb_ldif.o ldb_parse.o ldb_msg.o ldb_utf8.o ldb_debug.o ldb_modules.o ldb_match.o ldb_attributes.o attrib_handlers.o ldb_dn.o ldb_controls.o qsort.o) $(ldb_map_OBJ_FILES) PUBLIC_HEADERS += $(ldbdir)/include/ldb.h $(ldbdir)/include/ldb_errors.h |