diff options
| author | Michael Adam <obnox@samba.org> | 2009-06-19 20:31:33 +0200 |
|---|---|---|
| committer | Michael Adam <obnox@samba.org> | 2009-06-19 21:13:38 +0200 |
| commit | 23c7eccc27d2263c069522a1f67e549882490040 (patch) | |
| tree | 54583ab63f4e9fc0ed4a704670fc741a70a99e72 | |
| parent | bd70351b9493c2b3a057e47f5a393408234bdd8c (diff) | |
| download | samba-23c7eccc27d2263c069522a1f67e549882490040.tar.gz samba-23c7eccc27d2263c069522a1f67e549882490040.tar.bz2 samba-23c7eccc27d2263c069522a1f67e549882490040.zip | |
s3:build: build talloctort only when using the internal liballoc
Fixes the build with the external libtalloc.
And is the reasonable thing to do anyways.
Michael
| -rw-r--r-- | source3/Makefile.in | 8 | ||||
| -rw-r--r-- | source3/configure.in | 3 |
2 files changed, 8 insertions, 3 deletions
diff --git a/source3/Makefile.in b/source3/Makefile.in index c20ad9d771..a6c918ef95 100644 --- a/source3/Makefile.in +++ b/source3/Makefile.in @@ -83,6 +83,8 @@ LIBLUA_LIBS=@LIBLUA_LIBS@ LIBSMBCLIENT_LIBS=@LIBSMBCLIENT_LIBS@ LIBSMBSHAREMODES_LIBS=@LIBSMBSHAREMODES_LIBS@ +TALLOCTORT = @TALLOCTORT@ + TDBBACKUP = @TDBBACKUP@ TDBTOOL = @TDBTOOL@ TDBDUMP = @TDBDUMP@ @@ -218,7 +220,7 @@ BIN_PROGS4 = bin/ldbedit@EXEEXT@ bin/ldbsearch@EXEEXT@ bin/ldbadd@EXEEXT@ \ 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/pdbtest@EXEEXT@ $(TALLOCTORT) bin/replacetort@EXEEXT@ \ $(TDBTORTURE) \ bin/smbconftort@EXEEXT@ bin/vlp@EXEEXT@ @@ -226,7 +228,7 @@ BIN_PROGS = @EXTRA_BIN_PROGS@ \ $(BIN_PROGS1) $(BIN_PROGS2) $(BIN_PROGS3) $(BIN_PROGS4) EVERYTHING_PROGS = bin/debug2html@EXEEXT@ bin/smbfilter@EXEEXT@ \ - bin/talloctort@EXEEXT@ bin/replacetort@EXEEXT@ \ + $(TALLOCTORT) bin/replacetort@EXEEXT@ \ bin/log2pcap@EXEEXT@ \ bin/vlp@EXEEXT@ bin/smbiconv@EXEEXT@ \ bin/dbwrap_tool@EXEEXT@ @@ -1292,7 +1294,7 @@ eventlogadm: SHOWFLAGS bin/eventlogadm@EXEEXT@ sharesec: SHOWFLAGS bin/sharesec@EXEEXT@ -talloctort : SHOWFLAGS bin/talloctort@EXEEXT@ +talloctort : SHOWFLAGS $(TALLOCTORT) replacetort : SHOWFLAGS bin/replacetort@EXEEXT@ diff --git a/source3/configure.in b/source3/configure.in index bf9269c7d6..82a83a3e06 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -4727,6 +4727,9 @@ then done SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}" AC_SUBST(LIBTALLOC_OBJ0) + + TALLOCTORT="bin/talloctort\$(EXEEXT)" + AC_SUBST(TALLOCTORT) fi |