sin/samba-mirror
1
0
Fork 0
mirror of https://github.com/samba-team/samba.git synced 2025-11-09 20:23:51 +03:00
Code Activity

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.

Browse Source
This commit is contained in:
Jelmer Vernooij
2007-09-11 17:27:25 +00:00
committed by Gerald (Jerry) Carter
parent 1ba883c62e
commit 8aab673df5
5 changed files with 114 additions and 97 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
source/configure.ac
View File

@@ -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/sqlite3.m4)
m4_include(lib/ldb/libldb.m4) m4_include(lib/ldb/libldb.m4)
m4_include(lib/tls/config.m4) m4_include(lib/tls/config.m4)

99
source/lib/ldb/config.mk
View File

@@ -70,19 +70,6 @@ OBJ_FILES = \
# End MODULE ldb_rdn_name # 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 # Start MODULE ldb_map
[MODULE::ldb_map] [MODULE::ldb_map]
@@ -185,89 +172,6 @@ PUBLIC_HEADERS = include/ldb.h include/ldb_errors.h
# End SUBSYSTEM ldb # 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 # Start BINARY ldbtest
[BINARY::ldbtest] [BINARY::ldbtest]
@@ -312,3 +216,6 @@ LIBRARY_REALNAME = swig/_ldb.$(SHLIBEXT)
OBJ_FILES = swig/ldb_wrap.o OBJ_FILES = swig/ldb_wrap.o
# End LIBRARY swig_ldb # End LIBRARY swig_ldb
####################### #######################
include tools/config.mk
include ldb_ildap/config.mk

2
source/lib/ldb/configure.ac
View File

@@ -11,7 +11,7 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""]) AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
AC_DEFUN([SMB_EXT_LIB], [echo -n ""]) AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
AC_DEFUN([SMB_ENABLE], [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_CONFIG_SRCDIR([common/ldb.c])
AC_LIBREPLACE_ALL_CHECKS AC_LIBREPLACE_ALL_CHECKS

14
source/lib/ldb/ldb_ildap/config.mk Normal file
View File

@@ -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
################################################

84
source/lib/ldb/tools/config.mk Normal file
View File

@@ -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
################################################