summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Adam <obnox@samba.org>2009-06-19 19:45:58 +0200
committerMichael Adam <obnox@samba.org>2009-06-19 21:13:38 +0200
commitbd70351b9493c2b3a057e47f5a393408234bdd8c (patch)
tree35582221f2977e8fa7c5f754f3c0f6290a8c59ae
parente3c7720bfd199751fc8ed4a9f111a4ab72aae8b0 (diff)
downloadsamba-bd70351b9493c2b3a057e47f5a393408234bdd8c.tar.gz
samba-bd70351b9493c2b3a057e47f5a393408234bdd8c.tar.bz2
samba-bd70351b9493c2b3a057e47f5a393408234bdd8c.zip
s3:build: build the tdb tools only when using the internal libtdb
This fixes the build when internal libtdb is used. Michael
-rw-r--r--source3/Makefile.in13
-rw-r--r--source3/configure.in9
2 files changed, 18 insertions, 4 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 7bf74039f0..c20ad9d771 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -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@ \
diff --git a/source3/configure.in b/source3/configure.in
index 24276f5806..bf9269c7d6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -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)