The branch, v3-4-stable has been updated via 25e378df1869a7ac514124bb699344a1426556b3 (commit) via 83236f7761f7b526f5e234382b39ead813c8b819 (commit) from e1d73ad5256466c078cee699a71244fb4de7f8a4 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-stable - Log ----------------------------------------------------------------- commit 25e378df1869a7ac514124bb699344a1426556b3 Author: Karolin Seeger <ksee...@samba.org> Date: Mon Aug 17 20:27:00 2009 +0200 WHATSNEW: Update changes. Karolin (cherry picked from commit 97e1703ee5f647755129c6e859ea77a38200b3af) commit 83236f7761f7b526f5e234382b39ead813c8b819 Author: Stefan Metzmacher <me...@samba.org> Date: Fri Aug 14 16:41:49 2009 +0200 s3:configure: fix the build with external talloc Fixes bug #6532. metze (cherry picked from commit 7def4ab2da002e9ecc1feaed2916035c214add9f) ----------------------------------------------------------------------- Summary of changes: WHATSNEW.txt | 1 + source3/configure.in | 21 +++++++++++++-------- 2 files changed, 14 insertions(+), 8 deletions(-) Changeset truncated at 500 lines: diff --git a/WHATSNEW.txt b/WHATSNEW.txt index 2d89514..050d342 100644 --- a/WHATSNEW.txt +++ b/WHATSNEW.txt @@ -52,6 +52,7 @@ o Volker Lendecke <v...@samba.org> o Stefan Metzmacher <me...@samba.org> * BUG 6222: Default to DRSUAPI replication for net rpc vampire keytab. + * BUG 6532: Fix the build with external talloc. * BUG 6538: Cancel all locks that are made before the first failure. * BUG 6627: Raise the timeout for lsa_Lookup*() calls from 10 to 35 seconds. diff --git a/source3/configure.in b/source3/configure.in index dd60c73..892b836 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -39,17 +39,11 @@ then ]) fi -if test "x$enable_external_libtalloc" = xno +if test "x$enable_external_libtalloc" != xyes then m4_include(../lib/talloc/libtalloc.m4) fi -LIBTALLOC_OBJ0="" -for obj in ${TALLOC_OBJ}; do - LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}" -done -AC_SUBST(LIBTALLOC_OBJ0) - m4_include(../lib/tevent/libtevent.m4) LIBTEVENT_OBJ0="" @@ -4748,7 +4742,18 @@ LINK_LIBSMBCLIENT=STATIC # TODO: for talloc and tdb (at least), these should # be extracted from their respective source directories # -SMB_LIBRARY(talloc, 1) +if test "x$enable_external_libtalloc" != xyes +then + SMB_LIBRARY(talloc, 1) + LIBTALLOC_OBJ0="" + for obj in ${TALLOC_OBJ}; do + LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}" + done + AC_SUBST(LIBTALLOC_OBJ0) +else + LIBTALLOC_LIBS="${TALLOC_LIBS}" +fi + SMB_LIBRARY(tdb, 1) SMB_LIBRARY(netapi, 0) SMB_LIBRARY(smbclient, 0) -- Samba Shared Repository