[SCM] Samba Shared Repository - branch v3-4-stable updated - release-3-4-0-31-g2cc5abf

[Karolin Seeger]

The branch, v3-4-stable has been updated
       via  2cc5abf53dfe00a4d0fea1edb9d0445fc2f6fa23 (commit)
      from  e7b3192b804148b4243b99a7d5b90967e3d20e8d (commit)

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


- Log -----------------------------------------------------------------
commit 2cc5abf53dfe00a4d0fea1edb9d0445fc2f6fa23
Author: Karolin Seeger <ksee...@samba.org>
Date:   Fri Aug 14 16:12:33 2009 +0200

    Revert "Fix build with external talloc."
    
    This reverts commit bdec2d3bf3c69e0b0d8ff9aea4d234d0c2936743.
    (17ce6f9984b7d84534eecde007ae904e13bbfdfa) in v3-4-test
    
    With this patch, talloc.h is not found any longer.
    (cherry picked from commit b843551389e4f9dbbe984a4a9c376ebc11525267)

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

Summary of changes:
 source3/configure.in |   29 ++---------------------------
 source3/samba4.m4    |    4 ----
 2 files changed, 2 insertions(+), 31 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source3/configure.in b/source3/configure.in
index f6ee056..dd60c73 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -77,6 +77,7 @@ done
 AC_SUBST(LIBTDB_OBJ0)
 SAMBA_CPPFLAGS="-Iinclude -I${srcdir-.}/include  -I. -I${srcdir-.}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/../lib/replace"
+SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TEVENT_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TDB_CFLAGS}"
 SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} -I${srcdir-.}/libaddns"
@@ -4747,33 +4748,7 @@ LINK_LIBSMBCLIENT=STATIC
 #  TODO: for talloc and tdb (at least), these should
 #  be extracted from their respective source directories
 #
-AC_ARG_ENABLE(external_libtalloc, 
[AS_HELP_STRING([--enable-external-libtalloc], [Enable external talloc 
[default=auto]])], 
-[ enable_external_libtalloc=$enableval ], [ enable_external_libtalloc=auto ])
-
-if test "x$enable_external_libtalloc" != xno
-then
-       PKG_CHECK_MODULES(LIBTALLOC, talloc >= 1.3.0, 
-               [ enable_external_libtalloc=yes ],
-               [ if test x$enable_external_libtalloc = xyes; then
-                       AC_MSG_ERROR([Unable to find libtalloc])
-             else 
-                       enable_external_libtalloc=no
-                 fi
-               ])
-fi
-
-if test "x$enable_external_libtalloc" = xno
-then
-       m4_include(../lib/talloc/libtalloc.m4)
-       SMB_LIBRARY(talloc, 1)
-       LIBTALLOC_OBJ0=""
-       for obj in ${TALLOC_OBJ}; do
-               LIBTALLOC_OBJ0="${LIBTALLOC_OBJ0} ${tallocdir}/${obj}"
-       done
-       SAMBA_CPPFLAGS="${SAMBA_CPPFLAGS} ${TALLOC_CFLAGS}"
-       AC_SUBST(LIBTALLOC_OBJ0)
-fi
-
+SMB_LIBRARY(talloc, 1)
 SMB_LIBRARY(tdb, 1)
 SMB_LIBRARY(netapi, 0)
 SMB_LIBRARY(smbclient, 0)
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 0ea40db..b5c7c74 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -75,10 +75,6 @@ SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 
$TALLOC_MIN_VERSION,
                SMB_INCLUDE_MK(../lib/talloc/config.mk)
        ]
 )
-# Tallocdir isn't always set by the Samba3 c
-tallocdir=../lib/talloc
-AC_SUBST(tallocdir)
-CFLAGS="$CFLAGS -I../lib/talloc"
 
 SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= $TDB_MIN_VERSION,
        [],


-- 
Samba Shared Repository