From 42b9a7f4e0c03814926a9efbc01a7a9e5d61caa0 Mon Sep 17 00:00:00 2001 From: Stefan Metzmacher Date: Fri, 14 Aug 2009 16:41:49 +0200 Subject: [PATCH] s3:configure: fix the build with external talloc metze --- source3/configure.in | 21 +++++++++++++-------- 1 files changed, 13 insertions(+), 8 deletions(-) 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) -- 1.6.0.2