1
0
mirror of https://github.com/samba-team/samba.git synced 2024-12-23 17:34:34 +03:00

ldb: Fix dependencies when building with system ldb.

This commit is contained in:
Jelmer Vernooij 2010-05-31 16:05:41 +02:00
parent 471ed70c49
commit 82d56b9374
8 changed files with 37 additions and 13 deletions

View File

@ -12,7 +12,7 @@ bld.SAMBA_SUBSYSTEM('auth_session',
public_deps='CREDENTIALS',
public_headers='session.h',
header_path='samba',
deps='SAMDB'
deps='SAMDB auth_sam'
)

View File

@ -51,6 +51,6 @@ bld.SAMBA_MODULE('DNS_UPDATE_SRV',
bld.SAMBA_PYTHON('python_dsdb',
source='pydsdb.c',
deps='SAMDB pyldb',
deps='SAMDB pyldb_util',
realname='samba/dsdb.so'
)

View File

@ -21,12 +21,9 @@
License along with this library; if not, see <http://www.gnu.org/licenses/>.
*/
#include "ldb_includes.h"
#include "ldb.h"
#include "tools/cmdline.h"
#if (_SAMBA_BUILD_ >= 4)
#include "includes.h"
#include <ldb.h>
#include "lib/cmdline/popt_common.h"
#include "lib/ldb-samba/ldif_handlers.h"
#include "auth/gensec/gensec.h"
@ -36,8 +33,13 @@
#include "librpc/gen_ndr/drsblobs.h"
#include "dsdb/schema/schema.h"
#include "dsdb/common/proto.h"
#else
#include "ldb_includes.h"
#include "ldb.h"
#endif
#include "tools/cmdline.h"
static struct ldb_cmdline options; /* needs to be static for older compilers */
static struct poptOption popt_options[] = {

View File

@ -30,7 +30,14 @@
*
* Author: Andrew Tridgell
*/
#ifdef _SAMBA_BUILD_
#include "includes.h"
#include <system/filesys.h>
#else
#include "ldb_includes.h"
#endif
#include "ldb.h"
#include "tools/cmdline.h"
#include "tools/ldbutil.h"

View File

@ -31,8 +31,14 @@
* Author: Andrew Tridgell
*/
#ifdef _SAMBA_BUILD_
#include "includes.h"
#include <ldb.h>
#else
#include "ldb_includes.h"
#include "ldb.h"
#endif
#include "tools/cmdline.h"
static void usage(void)

View File

@ -31,7 +31,12 @@
* Author: Andrew Tridgell
*/
#ifdef _SAMBA_BUILD_
#include "includes.h"
#else
#include "ldb_includes.h"
#endif
#include "ldb.h"
#include "tools/cmdline.h"

View File

@ -152,7 +152,6 @@ def build(bld):
ldb_deps = 'tevent LIBLDB'
if s4_build:
ldb_deps += ' LDBSAMBA POPT_CREDENTIALS POPT_SAMBA LIBCMDLINE_CREDENTIALS gensec'
abi_file='ABI/ldb-samba4-%s.sigs' % VERSION
else:
abi_file='ABI/ldb-%s.sigs' % VERSION
@ -172,9 +171,18 @@ def build(bld):
vnum=VERSION, manpages='man/ldb.3',
is_bundled=not bld.env.standalone_ldb)
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
deps='ldb',
realname='ldb.so')
extra_cmdline_deps = ''
if s4_build:
extra_cmdline_deps += ' LDBSAMBA POPT_SAMBA POPT_CREDENTIALS ' \
'LIBCMDLINE_CREDENTIALS gensec'
bld.SAMBA_SUBSYSTEM('LIBLDB_CMDLINE',
'tools/ldbutil.c tools/cmdline.c',
'ldb dl popt')
'ldb dl popt' + extra_cmdline_deps)
LDB_TOOLS='ldbadd ldbsearch ldbdel ldbmodify ldbedit ldbrename'
for t in LDB_TOOLS.split():
@ -185,10 +193,6 @@ def build(bld):
bld.SAMBA_BINARY('ldbtest', 'tools/ldbtest.c', deps='LIBLDB_CMDLINE',
install=False)
bld.SAMBA_PYTHON('pyldb', 'pyldb.c',
deps='ldb',
realname='ldb.so')
def test(ctx):
'''run ldb testsuite'''

View File

@ -24,7 +24,7 @@ bld.SAMBA_PYTHON('python_uuid',
bld.SAMBA_PYTHON('python_glue',
source='pyglue.c',
deps='LIBNDR ldb SAMDB CREDENTIALS pyldb python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util',
deps='LIBNDR ldb SAMDB CREDENTIALS python_dcerpc_misc python_dcerpc_security pyauth pyldb_util pyparam_util',
realname='samba/_glue.so'
)