[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  70534ad... tdb: raise version to 1.2.1
      from  65710da... pam_winbind: Remove a nested if-statement. Bo, please check!

http://gitweb.samba.org/?p=samba.git;a=shortlog;h=master


- Log -----------------------------------------------------------------
commit 70534adee10fc6f5bba2d9304668dc6508e5de5a
Author: Simo Sorce <idra at samba.org>
Date:   Sat Feb 6 10:48:39 2010 -0500

    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.

-----------------------------------------------------------------------

Summary of changes:
 lib/tdb/configure.ac    |    2 +-
 source3/configure.in    |    2 +-
 source4/min_versions.m4 |    2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/configure.ac b/lib/tdb/configure.ac
index dac7bb2..3951219 100644
--- 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 f3c6ba5..14b57b6 100644
--- a/source3/configure.in
+++ b/source3/configure.in
@@ -1965,7 +1965,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 af8c4dd..c134c69 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.2.0)
+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)


-- 
Samba Shared Repository