diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:44:16 +0200 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2008-09-16 16:44:16 +0200 |
| commit | f957aeaee64745148b815393b1fc1338104ed2e1 (patch) | |
| tree | 3ab8268492918549f36f01faa6f90335b54bc789 /source3/configure.in | |
| parent | 80a5da73e9a9ed148314be3fa071181c82fc7c64 (diff) | |
| parent | 8ec93160d5cf2a0f917c1e1304127625e38ec2e0 (diff) | |
| download | samba-f957aeaee64745148b815393b1fc1338104ed2e1.tar.gz samba-f957aeaee64745148b815393b1fc1338104ed2e1.tar.bz2 samba-f957aeaee64745148b815393b1fc1338104ed2e1.zip | |
Merge branch 'singletdb' into single
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/source3/configure.in b/source3/configure.in index a2e0c0c875..446b833f06 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -33,7 +33,7 @@ AC_SUBST(LIBTALLOC_OBJ0) # TODO: These should come from m4_include(lib/tdb/libtdb.m4) # but currently this fails: things have to get merged from s4. -tdbdir="lib/tdb" +tdbdir="../tdb" AC_SUBST(tdbdir) TDB_CFLAGS="-I${srcdir-.}/$tdbdir/include" AC_SUBST(TDB_CFLAGS) @@ -43,7 +43,7 @@ for o in common/tdb.o common/dump.o common/transaction.o common/error.o \ common/traverse.o common/freelist.o common/freelistcheck.o \ common/io.o common/lock.o common/open.o; do - LIBTDB_OBJ0="$LIBTDB_OBJ0 lib/tdb/$o" + LIBTDB_OBJ0="$LIBTDB_OBJ0 $tdbdir/$o" done AC_SUBST(LIBTDB_OBJ0) |