mirror of
https://github.com/samba-team/samba.git
synced 2024-12-24 21:34:56 +03:00
s3:build: build the tdb tools only when using the internal libtdb
This fixes the build when internal libtdb is used. Michael
This commit is contained in:
parent
e3c7720bfd
commit
bd70351b94
@ -83,6 +83,11 @@ LIBLUA_LIBS=@LIBLUA_LIBS@
|
||||
LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@
|
||||
LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@
|
||||
|
||||
TDBBACKUP = @TDBBACKUP@
|
||||
TDBTOOL = @TDBTOOL@
|
||||
TDBDUMP = @TDBDUMP@
|
||||
TDBTORTURE = @TDBTORTURE@
|
||||
|
||||
INSTALLCMD=@INSTALL@
|
||||
INSTALLLIBCMD_SH=@INSTALLLIBCMD_SH@
|
||||
INSTALLLIBCMD_A=@INSTALLLIBCMD_A@
|
||||
@ -201,9 +206,9 @@ ROOT_SBIN_PROGS = @CIFSMOUNT_PROGS@
|
||||
|
||||
BIN_PROGS1 = bin/smbclient@EXEEXT@ bin/net@EXEEXT@ bin/smbspool@EXEEXT@ \
|
||||
bin/testparm@EXEEXT@ bin/smbstatus@EXEEXT@ bin/smbget@EXEEXT@
|
||||
BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ bin/tdbbackup@EXEEXT@ \
|
||||
bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ bin/tdbdump@EXEEXT@ \
|
||||
bin/tdbtool@EXEEXT@
|
||||
BIN_PROGS2 = bin/smbcontrol@EXEEXT@ bin/smbtree@EXEEXT@ $(TDBBACKUP) \
|
||||
bin/nmblookup@EXEEXT@ bin/pdbedit@EXEEXT@ $(TDBDUMP) \
|
||||
$(TDBTOOL)
|
||||
BIN_PROGS3 = bin/smbpasswd@EXEEXT@ bin/rpcclient@EXEEXT@ bin/smbcacls@EXEEXT@ \
|
||||
bin/profiles@EXEEXT@ bin/ntlm_auth@EXEEXT@ bin/sharesec@EXEEXT@ \
|
||||
bin/smbcquotas@EXEEXT@ bin/eventlogadm@EXEEXT@
|
||||
@ -214,7 +219,7 @@ TORTURE_PROGS = bin/smbtorture@EXEEXT@ bin/msgtest@EXEEXT@ \
|
||||
bin/masktest@EXEEXT@ bin/locktest@EXEEXT@ \
|
||||
bin/locktest2@EXEEXT@ bin/nsstest@EXEEXT@ bin/vfstest@EXEEXT@ \
|
||||
bin/pdbtest@EXEEXT@ bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \
|
||||
bin/tdbtorture@EXEEXT@ \
|
||||
$(TDBTORTURE) \
|
||||
bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@
|
||||
|
||||
BIN_PROGS = @EXTRA_BIN_PROGS@ \
|
||||
|
@ -4761,6 +4761,15 @@ then
|
||||
done
|
||||
AC_SUBST(LIBTDB_OBJ0)
|
||||
SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
|
||||
|
||||
TDBBACKUP="bin/tdbbackup\$(EXEEXT)"
|
||||
AC_SUBST(TDBBACKUP)
|
||||
TDBDUMP="bin/tdbdump\$(EXEEXT)"
|
||||
AC_SUBST(TDBDUMP)
|
||||
TDBTOOL="bin/tdbtool\$(EXEEXT)"
|
||||
AC_SUBST(TDBTOOL)
|
||||
TDBTORTURE="bin/tdbtorture\$(EXEEXT)"
|
||||
AC_SUBST(TDBTORTURE)
|
||||
fi
|
||||
|
||||
SMB_LIBRARY(netapi, 0)
|
||||
|
Loading…
Reference in New Issue
Block a user