tdb: raise version to 1.2.1

after recent fixes we need to raise the version to 1.2.1 so that
we can require also the right patched version.

Original commit was 70534adee10fc6f5bba2d9304668dc6508e5de5a in master.
source4/min_versions.m4 was copied from the master branch.
(cherry picked from commit 70128dded977498ef5a693214053192f13c93c6b)

diff --git a/lib/tdb/configure.ac b/lib/tdb/configure.ac
index dac7bb2673df8d14c982881e6a8bc88bf465e7ce..395121937f3b690a9bb5458bf9b47688279040f7 100644 (file)
--- a/lib/tdb/configure.ac
+++ b/lib/tdb/configure.ac
@@ -2,7 +2,7 @@ AC_PREREQ(2.50)
 AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(tdb, 1.2.0)
+AC_INIT(tdb, 1.2.1)
 AC_CONFIG_SRCDIR([common/tdb.c])
 AC_CONFIG_HEADER(include/config.h)
 AC_LIBREPLACE_ALL_CHECKS

diff --git a/source3/configure.in b/source3/configure.in
index f060a6524c23f51564c192f0cc514009b9108200..449645faa9c5fd6321467162ee7cd262ac8ca204 100644 (file)
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1923,7 +1923,7 @@ AC_ARG_ENABLE(external_libtdb,
 
 if test "x$enable_external_libtdb" != xno
 then
-       PKG_CHECK_MODULES(LIBTDB, tdb >= 1.1.7,
+       PKG_CHECK_MODULES(LIBTDB, tdb >= 1.2.1,
                [ enable_external_libtdb=yes ],
                [
                if test x$enable_external_libtdb = xyes; then

diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
index 6e49783778a635e01b7741f6566a9d0109363d0d..c134c693dd5cd03b0a7ce7dcf7adb49ac584b4c0 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.7)
-define(TALLOC_MIN_VERSION,2.0.0)
-define(LDB_REQUIRED_VERSION,0.9.7)
+define(TDB_MIN_VERSION,1.2.1)
+define(TALLOC_MIN_VERSION,2.0.1)
+define(LDB_REQUIRED_VERSION,0.9.10)
 define(TEVENT_REQUIRED_VERSION,0.9.8)