summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAndrew Tridgell <tridge@samba.org>2009-07-02 15:19:40 +1000
committerAndrew Tridgell <tridge@samba.org>2009-07-02 15:19:40 +1000
commitacfb01a8f63f5b84c271ae0599bf40d92237cdf9 (patch)
treecd51372ff56d25b5d5249ce8cd5552b1ddec2b05
parent465b879902dcf06940730ec41542fbdf7bd8dc08 (diff)
downloadsamba-acfb01a8f63f5b84c271ae0599bf40d92237cdf9.tar.gz
samba-acfb01a8f63f5b84c271ae0599bf40d92237cdf9.tar.bz2
samba-acfb01a8f63f5b84c271ae0599bf40d92237cdf9.zip
change talloc to 2.0.0
This is needed to prevent samba3 and samba4 from using an ABI incompatible system version of talloc See ongoing discussion on the samba-technical mailing list
-rw-r--r--lib/talloc/configure.ac2
-rw-r--r--source3/configure.in2
-rw-r--r--source4/min_versions.m42
3 files changed, 3 insertions, 3 deletions
diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index a644f6d800..d6471a4aa7 100644
--- a/lib/talloc/configure.ac
+++ b/lib/talloc/configure.ac
@@ -1,5 +1,5 @@
AC_PREREQ(2.50)
-AC_INIT(talloc, 1.3.1)
+AC_INIT(talloc, 2.0.0)
AC_CONFIG_SRCDIR([talloc.c])
AC_SUBST(datarootdir)
AC_CONFIG_HEADER(config.h)
diff --git a/source3/configure.in b/source3/configure.in
index 027433611b..a1388fdff1 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -4737,7 +4737,7 @@ AC_ARG_ENABLE(external_libtalloc, [AS_HELP_STRING([--enable-external-libtalloc],
if test "x$enable_external_libtalloc" != xno
then
- PKG_CHECK_MODULES(LIBTALLOC, talloc >= 1.3.0,
+ PKG_CHECK_MODULES(LIBTALLOC, talloc >= 2.0.0,
[ enable_external_libtalloc=yes ],
[ if test x$enable_external_libtalloc = xyes; then
AC_MSG_ERROR([Unable to find libtalloc])
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
index 320b209941..ecc8e10ffc 100644
--- a/source4/min_versions.m4
+++ b/source4/min_versions.m4
@@ -1,6 +1,6 @@
# Minimum and exact required versions for various libraries
# if we use the ones installed in the system.
define(TDB_MIN_VERSION,1.1.5)
-define(TALLOC_MIN_VERSION,1.3.0)
+define(TALLOC_MIN_VERSION,2.0.0)
define(LDB_REQUIRED_VERSION,0.9.6)
define(TEVENT_REQUIRED_VERSION,0.9.6)