[SCM] Samba Shared Repository - branch master updated

[Rusty Russell]

The branch, master has been updated
       via  b7cd6af tdb: fix non-WAF build, commit 1.2.6 ABI file.
      from  2dcf76c tdb: TDB_INCOMPATIBLE_HASH, to allow safe changing of default hash.

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


- Log -----------------------------------------------------------------
commit b7cd6af5b45840a3588ad0cd50b4414f32f8b792
Author: Rusty Russell <rusty at rustcorp.com.au>
Date:   Mon Sep 27 11:06:51 2010 +0930

    tdb: fix non-WAF build, commit 1.2.6 ABI file.
    
    Sorry Jeremy.
    
    Signed-off-by: Rusty Russell <rusty at rustcorp.com.au>

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

Summary of changes:
 lib/tdb/ABI/{tdb-1.2.5.sigs => tdb-1.2.6.sigs} |    0
 lib/tdb/libtdb.m4                              |    2 +-
 2 files changed, 1 insertions(+), 1 deletions(-)
 copy lib/tdb/ABI/{tdb-1.2.5.sigs => tdb-1.2.6.sigs} (100%)


Changeset truncated at 500 lines:

diff --git a/lib/tdb/ABI/tdb-1.2.5.sigs b/lib/tdb/ABI/tdb-1.2.6.sigs
similarity index 100%
copy from lib/tdb/ABI/tdb-1.2.5.sigs
copy to lib/tdb/ABI/tdb-1.2.6.sigs
diff --git a/lib/tdb/libtdb.m4 b/lib/tdb/libtdb.m4
index fb8913a..e650bc6 100644
--- a/lib/tdb/libtdb.m4
+++ b/lib/tdb/libtdb.m4
@@ -13,7 +13,7 @@ if test x"$tdbdir" = "x"; then
    AC_MSG_ERROR([cannot find tdb source in $tdbpaths])
 fi
 TDB_OBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o"
-TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o"
+TDB_OBJ="$TDB_OBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o common/check.o common/hash.o"
 AC_SUBST(TDB_OBJ)
 AC_SUBST(LIBREPLACEOBJ)
 


-- 
Samba Shared Repository