From 2e5f023a69cda6f507a2a820c97b0f095ce44678 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
Date: Tue, 11 Sep 2007 17:27:25 +0000
Subject: r25093: Use system-provided ldb library if available. Note that this
 only means using the ldb library from the system - the custom command-line
 tools for Samba 4 will still be built even if they are already provided by
 the system. (This used to be commit 8aab673df5200a4555777caf4ee58907cf6fe4cc)

---
 source4/lib/ldb/config.mk | 99 ++---------------------------------------------
 1 file changed, 3 insertions(+), 96 deletions(-)

(limited to 'source4/lib/ldb/config.mk')

diff --git a/source4/lib/ldb/config.mk b/source4/lib/ldb/config.mk
index dcc66d3bb0..473c7edd80 100644
--- a/source4/lib/ldb/config.mk
+++ b/source4/lib/ldb/config.mk
@@ -70,19 +70,6 @@ OBJ_FILES = \
 # End MODULE ldb_rdn_name
 ################################################
 
-################################################
-# Start MODULE ldb_ildap
-[MODULE::ldb_ildap]
-SUBSYSTEM = LIBLDB
-CFLAGS = -Ilib/ldb/include
-PRIVATE_DEPENDENCIES = LIBTALLOC LIBCLI_LDAP
-INIT_FUNCTION = ldb_ildap_init
-ALIASES = ldapi ldaps ldap
-OBJ_FILES = \
-		ldb_ildap/ldb_ildap.o
-# End MODULE ldb_ildap
-################################################
-
 ################################################
 # Start MODULE ldb_map
 [MODULE::ldb_map]
@@ -185,89 +172,6 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
 # End SUBSYSTEM ldb
 ################################################
 
-################################################
-# Start SUBSYSTEM LIBLDB_CMDLINE
-[SUBSYSTEM::LIBLDB_CMDLINE]
-CFLAGS = -Ilib/ldb
-OBJ_FILES= \
-		tools/cmdline.o
-PUBLIC_DEPENDENCIES = LIBLDB LIBPOPT
-PRIVATE_DEPENDENCIES = LIBSAMBA-UTIL POPT_SAMBA POPT_CREDENTIALS gensec
-# End SUBSYSTEM LIBLDB_CMDLINE
-################################################
-
-################################################
-# Start BINARY ldbadd
-[BINARY::ldbadd]
-INSTALLDIR = BINDIR
-OBJ_FILES = \
-		tools/ldbadd.o
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE LIBCLI_RESOLVE
-MANPAGE = man/ldbadd.1
-# End BINARY ldbadd
-################################################
-
-################################################
-# Start BINARY ldbdel
-[BINARY::ldbdel]
-INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/ldbdel.o
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-MANPAGE = man/ldbdel.1
-# End BINARY ldbdel
-################################################
-
-################################################
-# Start BINARY ldbmodify
-[BINARY::ldbmodify]
-INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/ldbmodify.o
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-MANPAGE = man/ldbmodify.1
-# End BINARY ldbmodify
-################################################
-
-################################################
-# Start BINARY ldbsearch
-[BINARY::ldbsearch]
-INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/ldbsearch.o
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE 
-MANPAGE = man/ldbsearch.1
-# End BINARY ldbsearch
-################################################
-
-################################################
-# Start BINARY ldbedit
-[BINARY::ldbedit]
-INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/ldbedit.o
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-MANPAGE = man/ldbedit.1
-# End BINARY ldbedit
-################################################
-
-################################################
-# Start BINARY ldbrename
-[BINARY::ldbrename]
-INSTALLDIR = BINDIR
-OBJ_FILES= \
-		tools/ldbrename.o
-PRIVATE_DEPENDENCIES = \
-		LIBLDB_CMDLINE
-MANPAGE = man/ldbrename.1
-# End BINARY ldbrename
-################################################
-
 ################################################
 # Start BINARY ldbtest
 [BINARY::ldbtest]
@@ -312,3 +216,6 @@ LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
 OBJ_FILES = swig/ldb_wrap.o
 # End LIBRARY swig_ldb
 #######################
+
+include tools/config.mk
+include ldb_ildap/config.mk
-- 
cgit