[SCM] Samba Shared Repository - branch master updated

[Andrew Bartlett]

The branch, master has been updated
       via  b2d8e11... s4:build Bump ldb and tdb required versions.
      from  1bf825b... s4 torture: Cleanup RAW-ACLS a bit

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


- Log -----------------------------------------------------------------
commit b2d8e1118dd8d7826a60ffc5759d6be30a659338
Author: Andrew Bartlett <abartlet at samba.org>
Date:   Tue Dec 8 10:27:30 2009 +1100

    s4:build Bump ldb and tdb required versions.
    
    Hopefully this will ensure we don't get an older version from the system.

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

Summary of changes:
 source4/lib/ldb/configure.ac       |    2 +-
 source4/lib/ldb/external/libtdb.m4 |    2 +-
 source4/min_versions.m4            |    4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)


Changeset truncated at 500 lines:

diff --git a/source4/lib/ldb/configure.ac b/source4/lib/ldb/configure.ac
index af1d7f9..29c31a1 100644
--- a/source4/lib/ldb/configure.ac
+++ b/source4/lib/ldb/configure.ac
@@ -11,7 +11,7 @@ AC_DEFUN([SMB_MODULE_DEFAULT], [echo -n ""])
 AC_DEFUN([SMB_LIBRARY_ENABLE], [echo -n ""])
 AC_DEFUN([SMB_EXT_LIB], [echo -n ""])
 AC_DEFUN([SMB_ENABLE], [echo -n ""])
-AC_INIT(ldb, 0.9.9)
+AC_INIT(ldb, 0.9.10)
 AC_CONFIG_SRCDIR([common/ldb.c])
 
 AC_LIBREPLACE_ALL_CHECKS
diff --git a/source4/lib/ldb/external/libtdb.m4 b/source4/lib/ldb/external/libtdb.m4
index 44971e1..eb5a020 100644
--- a/source4/lib/ldb/external/libtdb.m4
+++ b/source4/lib/ldb/external/libtdb.m4
@@ -4,4 +4,4 @@ AC_SUBST(TDB_LIBS)
 
 AC_CHECK_HEADER(tdb.h,
    [AC_CHECK_LIB(tdb, tdb_open, [TDB_LIBS="-ltdb"]) ],
-   [PKG_CHECK_MODULES(TDB, tdb >= 1.1.6)])
+   [PKG_CHECK_MODULES(TDB, tdb >= 1.2.0)])
diff --git a/source4/min_versions.m4 b/source4/min_versions.m4
index 7cd02a5..5bb3b0b 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.7)
+define(TDB_MIN_VERSION,1.2.0)
 define(TALLOC_MIN_VERSION,2.0.0)
-define(LDB_REQUIRED_VERSION,0.9.9)
+define(LDB_REQUIRED_VERSION,0.9.10)
 define(TEVENT_REQUIRED_VERSION,0.9.8)


-- 
Samba Shared Repository