[SCM] Samba Shared Repository - branch master updated

[Simo Sorce]

The branch, master has been updated
       via  7bce1ab... Fix builds with external tdb
      from  815b790... Use the method used by build_env.sh to discover the user name.

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


- Log -----------------------------------------------------------------
commit 7bce1ab5e88dd4cf5599ad3a986fbbf8fc61f9d5
Author: Simo Sorce <idra at samba.org>
Date:   Sun Oct 11 09:42:59 2009 -0400

    Fix builds with external tdb
    
    Make sure we do not reference our internal tdb directly.
    Let configure define what tdb.h file to use so that builds that use an
    extrenal tdb do not include 2 different versions of the tdb header.

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

Summary of changes:
 lib/util/util_tdb.c               |    2 +-
 source3/lib/ldb/ldb_tdb/ldb_tdb.h |    6 ------
 2 files changed, 1 insertions(+), 7 deletions(-)


Changeset truncated at 500 lines:

diff --git a/lib/util/util_tdb.c b/lib/util/util_tdb.c
index e107cbd..cda8dc7 100644
--- a/lib/util/util_tdb.c
+++ b/lib/util/util_tdb.c
@@ -20,7 +20,7 @@
 */
 
 #include "includes.h"
-#include "../tdb/include/tdb.h"
+#include "tdb.h"
 #include "../lib/util/util_tdb.h"
 
 /* these are little tdb utility functions that are meant to make
diff --git a/source3/lib/ldb/ldb_tdb/ldb_tdb.h b/source3/lib/ldb/ldb_tdb/ldb_tdb.h
index 486d948..caf8ba8 100644
--- a/source3/lib/ldb/ldb_tdb/ldb_tdb.h
+++ b/source3/lib/ldb/ldb_tdb/ldb_tdb.h
@@ -3,13 +3,7 @@
 #include "system/filesys.h"
 #endif
 
-#if (_SAMBA_BUILD_ >= 4)
-#include "lib/tdb/include/tdb.h"
-#elif defined(_SAMBA_BUILD_)
-#include "../tdb/include/tdb.h"
-#else
 #include "tdb.h"
-#endif
 
 /* this private structure is used by the ltdb backend in the
    ldb_context */


-- 
Samba Shared Repository