diff options
| author | Jeremy Allison <jra@samba.org> | 2007-11-06 22:57:35 -0800 |
|---|---|---|
| committer | Jeremy Allison <jra@samba.org> | 2007-11-06 22:57:35 -0800 |
| commit | 3809490dd0ceb902c002bfeff09e6c04946e1a0c (patch) | |
| tree | 115bfa178b8e55bd7229316e22a3849fac519366 /source3/lib/tdb/libtdb.m4 | |
| parent | d8f3c9d0786ff637241d2a9409e1c7c253715ba5 (diff) | |
| download | samba-3809490dd0ceb902c002bfeff09e6c04946e1a0c.tar.gz samba-3809490dd0ceb902c002bfeff09e6c04946e1a0c.tar.bz2 samba-3809490dd0ceb902c002bfeff09e6c04946e1a0c.zip | |
Keep the tdb code in sync with Samba4.
Mainly this is the svn changes :
------------------------------------------------------------------------
r23238 | tridge | 2007-05-30 01:15:49 -0700 (Wed, 30 May 2007) | 6 lines
merged transaction lock changes from ctdb
this ensures that having the global lock also implies the transaction
lock
------------------------------------------------------------------------
r22832 | tridge | 2007-05-13 18:00:06 -0700 (Sun, 13 May 2007) | 3 lines
merged the latest tdb changes from ctdb to Samba4
Jeremy.
(This used to be commit ab11c0055761e97ba32a8c3ec4fa6f8763a262cd)
Diffstat (limited to 'source3/lib/tdb/libtdb.m4')
| -rw-r--r-- | source3/lib/tdb/libtdb.m4 | 12 |
1 files changed, 9 insertions, 3 deletions
diff --git a/source3/lib/tdb/libtdb.m4 b/source3/lib/tdb/libtdb.m4 index fefa5912c2..7682edada9 100644 --- a/source3/lib/tdb/libtdb.m4 +++ b/source3/lib/tdb/libtdb.m4 @@ -12,11 +12,17 @@ done if test x"$tdbdir" = "x"; then AC_MSG_ERROR([cannot find tdb source in $tdbpaths]) fi -TDBOBJ="common/tdb.o common/dump.o common/transaction.o common/error.o common/traverse.o" -TDBOBJ="$TDBOBJ common/freelist.o common/freelistcheck.o common/io.o common/lock.o common/open.o" -AC_SUBST(TDBOBJ) +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" +AC_SUBST(TDB_OBJ) AC_SUBST(LIBREPLACEOBJ) +TDB_LIBS="" +AC_SUBST(TDB_LIBS) + +TDB_CFLAGS="-I$tdbdir/include" +AC_SUBST(TDB_CFLAGS) + AC_CHECK_FUNCS(mmap pread pwrite getpagesize utime) AC_CHECK_HEADERS(getopt.h sys/select.h sys/time.h) |