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

diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac
index a644f6d80091580ecebcbc753ed762fcbbeb237c..d6471a4aa7691f51a74865685649d811a09cfd7f 100644 (file)
--- 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 027433611bad4a1946a8ae8227273d82179872c1..a1388fdff12e3a9181e4b770e42edb1dc993e196 100644 (file)
--- 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 320b209941febe2742e3e3cc10aa5af040bca3b3..ecc8e10ffc334639ed30bf43e4bc98eff5673b8d 100644 (file)
--- 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)