[SCM] Samba Shared Repository - branch v3-4-test updated - release-4-0-0alpha7-1220-g7def4ab

[Karolin Seeger]

The branch, v3-4-test has been updated
       via  7def4ab2da002e9ecc1feaed2916035c214add9f (commit)
      from  7505f03eee949bb861f6138be8b5ef86be9c7b7f (commit)

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=v3-4-test


- Log -----------------------------------------------------------------
commit 7def4ab2da002e9ecc1feaed2916035c214add9f
Author: Stefan Metzmacher <metze at samba.org>
Date:   Fri Aug 14 16:41:49 2009 +0200

    s3:configure: fix the build with external talloc
    
    Fixes bug #6532.
    
    metze

-----------------------------------------------------------------------

Summary of changes:
 source3/configure.in |   21 +++++++++++++--------
 1 files changed, 13 insertions(+), 8 deletions(-)


Changeset truncated at 500 lines:

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