r25093: Use system-provided ldb library if available. Note that this only means using...

diff --git a/source/configure.ac b/source/configure.ac
index bb326985f3b791fe5b87cdf84de203fc5621ed14..4305bf717db0e6363215ce045c711243fc4ddc70 100644 (file)
--- a/source/configure.ac
+++ b/source/configure.ac
@@ -43,6 +43,18 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
        ]
 )
 
+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)
+       ],
+       [
+               m4_include(lib/ldb/libldb.m4)
+               SMB_INCLUDE_MK(lib/ldb/config.mk)
+       ]
+)
+
 m4_include(lib/ldb/sqlite3.m4)
 m4_include(lib/ldb/libldb.m4)
 m4_include(lib/tls/config.m4)

diff --git a/source/lib/ldb/config.mk b/source/lib/ldb/config.mk
index dcc66d3bb0c6836c4a68a7576db3be4db56c06c2..473c7edd80e99298a72bfb3dfbbed16554cbef51 100644 (file)
--- a/source/lib/ldb/config.mk
+++ b/source/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

diff --git a/source/lib/ldb/configure.ac b/source/lib/ldb/configure.ac
index f4dbe187e6128b0b8de22a0aa42db6afaaf783b7..776877111b2ec3c86b4038d4534be4aa4c56292b 100644 (file)
--- a/source/lib/ldb/configure.ac
+++ b/source/lib/ldb/configure.ac
@@ -11,7 +11,7 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
 AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(ldb, 0.9.0)
+AC_INIT(ldb, 0.9.1)
 AC_CONFIG_SRCDIR([common/ldb.c])
 
 AC_LIBREPLACE_ALL_CHECKS

diff --git a/source/lib/ldb/ldb_ildap/config.mk b/source/lib/ldb/ldb_ildap/config.mk
new file mode 100644 (file)
index 0000000..71887c1
--- /dev/null
+++ b/source/lib/ldb/ldb_ildap/config.mk
@@ -0,0 +1,14 @@
+################################################
+# 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.o
+# End MODULE ldb_ildap
+################################################
+
+

diff --git a/source/lib/ldb/tools/config.mk b/source/lib/ldb/tools/config.mk
new file mode 100644 (file)
index 0000000..19ff943
--- /dev/null
+++ b/source/lib/ldb/tools/config.mk
@@ -0,0 +1,84 @@
+################################################
+# Start SUBSYSTEM LIBLDB_CMDLINE
+[SUBSYSTEM::LIBLDB_CMDLINE]
+CFLAGS = -Ilib/ldb
+OBJ_FILES= \
+               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 = \
+               ldbadd.o
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE LIBCLI_RESOLVE
+MANPAGE = ../man/ldbadd.1
+# End BINARY ldbadd
+################################################
+
+################################################
+# Start BINARY ldbdel
+[BINARY::ldbdel]
+INSTALLDIR = BINDIR
+OBJ_FILES= \
+               ldbdel.o
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE
+MANPAGE = ../man/ldbdel.1
+# End BINARY ldbdel
+################################################
+
+################################################
+# Start BINARY ldbmodify
+[BINARY::ldbmodify]
+INSTALLDIR = BINDIR
+OBJ_FILES= \
+               ldbmodify.o
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE
+MANPAGE = ../man/ldbmodify.1
+# End BINARY ldbmodify
+################################################
+
+################################################
+# Start BINARY ldbsearch
+[BINARY::ldbsearch]
+INSTALLDIR = BINDIR
+OBJ_FILES= \
+               ldbsearch.o
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE 
+MANPAGE = ../man/ldbsearch.1
+# End BINARY ldbsearch
+################################################
+
+################################################
+# Start BINARY ldbedit
+[BINARY::ldbedit]
+INSTALLDIR = BINDIR
+OBJ_FILES= \
+               ldbedit.o
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE
+MANPAGE = ../man/ldbedit.1
+# End BINARY ldbedit
+################################################
+
+################################################
+# Start BINARY ldbrename
+[BINARY::ldbrename]
+INSTALLDIR = BINDIR
+OBJ_FILES= \
+               ldbrename.o
+PRIVATE_DEPENDENCIES = \
+               LIBLDB_CMDLINE
+MANPAGE = ../man/ldbrename.1
+# End BINARY ldbrename
+################################################
+
+