[SCM] Samba Shared Repository - branch master updated -
release-4-0-0alpha7-367-g7429958
Jelmer Vernooij
jelmer at samba.org
Sun Mar 15 13:56:26 GMT 2009
The branch, master has been updated
via 74299582c4989d00a45962836bb02cc7f4b2dd20 (commit)
via 251bf8aab5eb89b1c36696fa661d7f105ab71923 (commit)
via a3d2b77ddd9808b35300446cebca1b403ca56f78 (commit)
via 4ceaec6725509dac4a5c71421dabea1da96b70ab (commit)
via acb6018091cf202c70632fda69a34df11310d4ef (commit)
via 0c72c503faa0506ed25067e623f9263da8e2c94c (commit)
via 61447dfbbfe275e3704ff939480f38629b52064a (commit)
from 8afd835cea1a8138a4e21702e610b0b0e9904700 (commit)
http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master
- Log -----------------------------------------------------------------
commit 74299582c4989d00a45962836bb02cc7f4b2dd20
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 14:55:12 2009 +0100
Depend on newer talloc for Samba 4 in the merged build as well.
commit 251bf8aab5eb89b1c36696fa661d7f105ab71923
Merge: 8afd835cea1a8138a4e21702e610b0b0e9904700 a3d2b77ddd9808b35300446cebca1b403ca56f78
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sun Mar 15 13:52:01 2009 +0100
Merge branch 'checktalloc' of /home/jelmer/samba4
commit a3d2b77ddd9808b35300446cebca1b403ca56f78
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 14 23:01:57 2009 +0100
Properly strip /usr/lib and /usr/include for the merged build.
commit 4ceaec6725509dac4a5c71421dabea1da96b70ab
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 14 22:07:15 2009 +0100
Depend on a newer talloc in Samba 4.
commit acb6018091cf202c70632fda69a34df11310d4ef
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 14 21:08:09 2009 +0100
Fix comment about shell in Makefile.
commit 0c72c503faa0506ed25067e623f9263da8e2c94c
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 14 21:06:41 2009 +0100
Fix fallback if system doesn't provide talloc.
commit 61447dfbbfe275e3704ff939480f38629b52064a
Author: Jelmer Vernooij <jelmer at samba.org>
Date: Sat Mar 14 20:56:26 2009 +0100
Allow using external libtalloc.
-----------------------------------------------------------------------
Summary of changes:
{lib/tevent => m4}/pkg.m4 | 0
source3/Makefile.in | 5 ++---
source3/autogen.sh | 2 +-
source3/configure.in | 21 ++++++++++++++++++++-
source3/samba4.m4 | 10 +++++++++-
source4/configure.ac | 2 +-
6 files changed, 33 insertions(+), 7 deletions(-)
copy {lib/tevent => m4}/pkg.m4 (100%)
Changeset truncated at 500 lines:
diff --git a/lib/tevent/pkg.m4 b/m4/pkg.m4
similarity index 100%
copy from lib/tevent/pkg.m4
copy to m4/pkg.m4
diff --git a/source3/Makefile.in b/source3/Makefile.in
index 6b0a151..f69c39b 100644
--- a/source3/Makefile.in
+++ b/source3/Makefile.in
@@ -88,12 +88,11 @@ UNINSTALLLIBCMD_A=@UNINSTALLLIBCMD_A@
VPATH=@srcdir@
srcdir=@abs_srcdir@
builddir=@abs_builddir@
-SHELL=/bin/sh
-DESTDIR=/
-
# XXX: Perhaps this should be @SHELL@ instead -- apparently autoconf
# will search for a POSIX-compliant shell, and that might not be
# /bin/sh on some platforms. I guess it's not a big problem -- mbp
+SHELL=/bin/sh
+DESTDIR=/
# See the autoconf manual "Installation Directory Variables" for a
# discussion of the subtle use of these variables.
diff --git a/source3/autogen.sh b/source3/autogen.sh
index 1a33eb2..9ade370 100755
--- a/source3/autogen.sh
+++ b/source3/autogen.sh
@@ -65,7 +65,7 @@ echo "$0: running script/mkversion.sh"
rm -rf autom4te*.cache
rm -f configure include/config.h*
-IPATHS="-Im4 -I../lib/replace -I../source4"
+IPATHS="-Im4 -I../m4 -I../lib/replace -I../source4"
echo "$0: running $AUTOHEADER $IPATHS"
$AUTOHEADER $IPATHS || exit 1
diff --git a/source3/configure.in b/source3/configure.in
index ab5e81f..98f41d6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -20,10 +20,29 @@ AC_SUBST(builddir)
m4_include(m4/samba_version.m4)
m4_include(m4/check_path.m4)
+m4_include(pkg.m4)
AC_LIBREPLACE_CC_CHECKS
-m4_include(../lib/talloc/libtalloc.m4)
+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(TALLOC, talloc >= 1.3.0,
+ [ enable_external_libtalloc=yes ],
+ [ if 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)
+fi
LIBTALLOC_OBJ0=""
for obj in ${TALLOC_OBJ}; do
diff --git a/source3/samba4.m4 b/source3/samba4.m4
index 97a1a3b..897a9b8 100644
--- a/source3/samba4.m4
+++ b/source3/samba4.m4
@@ -67,7 +67,7 @@ AC_CONFIG_FILES(../source4/param/samba-hostconfig.pc)
AC_CONFIG_FILES(../source4/librpc/dcerpc_samr.pc)
AC_CONFIG_FILES(../source4/librpc/dcerpc_atsvc.pc)
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0,
+SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0,
[],
[
SMB_INCLUDE_MK(../lib/talloc/config.mk)
@@ -152,6 +152,14 @@ fi
dnl Samba 4 files
AC_SUBST(LD)
AC_LIBREPLACE_SHLD_FLAGS
+dnl Remove -L/usr/lib/? from LDFLAGS and LIBS
+LIB_REMOVE_USR_LIB(LDFLAGS)
+LIB_REMOVE_USR_LIB(LIBS)
+LIB_REMOVE_USR_LIB(KRB5_LIBS)
+
+dnl Remove -I/usr/include/? from CFLAGS and CPPFLAGS
+CFLAGS_REMOVE_USR_INCLUDE(CFLAGS)
+CFLAGS_REMOVE_USR_INCLUDE(CPPFLAGS)
SMB_WRITE_MAKEVARS(samba4-config.mk, [prefix exec_prefix CPPFLAGS LDSHFLAGS POPT_OBJ CFLAGS TALLOC_OBJ POPT_LIBS srcdir builddir])
oldbuilddir="$builddir"
diff --git a/source4/configure.ac b/source4/configure.ac
index 87ed4d8..a1eb4f4 100644
--- a/source4/configure.ac
+++ b/source4/configure.ac
@@ -42,7 +42,7 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc)
AC_CONFIG_FILES(librpc/dcerpc_samr.pc)
AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc)
-SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.1, [],
+SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.3.0, [],
[
m4_include(../lib/talloc/libtalloc.m4)
SMB_INCLUDE_MK(../lib/talloc/config.mk)
--
Samba Shared Repository
More information about the samba-cvs
mailing list