From acfb01a8f63f5b84c271ae0599bf40d92237cdf9 Mon Sep 17 00:00:00 2001 From: Andrew Tridgell Date: Thu, 2 Jul 2009 15:19:40 +1000 Subject: [PATCH] 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 --- lib/talloc/configure.ac | 2 +- source3/configure.in | 2 +- source4/min_versions.m4 | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac index a644f6d8009..d6471a4aa76 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 027433611ba..a1388fdff12 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 320b209941f..ecc8e10ffc3 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) -- 2.34.1