diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-04-30 10:49:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:51:50 -0500 |
| commit | 42cf31f3c695913b68500302ebb2dc6cd0df4464 (patch) | |
| tree | d83f788cdfeffc2575b93b1a2326c36d67f45be9 /source4/lib/tdb | |
| parent | d8e28e1f6d6af2c1d196bc6707aeb8940fd73e31 (diff) | |
| download | samba-42cf31f3c695913b68500302ebb2dc6cd0df4464.tar.gz samba-42cf31f3c695913b68500302ebb2dc6cd0df4464.tar.bz2 samba-42cf31f3c695913b68500302ebb2dc6cd0df4464.zip | |
r22600: Update bzr ignores, put right version in .pc files, prepare for support of system versions of tdb, talloc.
(This used to be commit 9b991ce9ca28b3d88c778305ec5f681506162637)
Diffstat (limited to 'source4/lib/tdb')
| -rw-r--r-- | source4/lib/tdb/Makefile.in | 2 | ||||
| -rw-r--r-- | source4/lib/tdb/libtdb.m4 | 9 | ||||
| -rw-r--r-- | source4/lib/tdb/tdb.pc.in | 2 |
3 files changed, 8 insertions, 5 deletions
diff --git a/source4/lib/tdb/Makefile.in b/source4/lib/tdb/Makefile.in index 6bdfba2354..4a6382c104 100644 --- a/source4/lib/tdb/Makefile.in +++ b/source4/lib/tdb/Makefile.in @@ -23,7 +23,7 @@ PROGS = bin/tdbtool$(EXEEXT) bin/tdbtorture$(EXEEXT) PROGS_NOINSTALL = bin/tdbtest$(EXEEXT) bin/tdbdump$(EXEEXT) bin/tdbbackup$(EXEEXT) ALL_PROGS = $(PROGS) $(PROGS_NOINSTALL) -TDB_OBJ = @TDBOBJ@ @LIBREPLACEOBJ@ +TDB_OBJ = @TDB_OBJ@ @LIBREPLACEOBJ@ DIRS = bin common tools diff --git a/source4/lib/tdb/libtdb.m4 b/source4/lib/tdb/libtdb.m4 index 58523fc2dc..7682edada9 100644 --- a/source4/lib/tdb/libtdb.m4 +++ b/source4/lib/tdb/libtdb.m4 @@ -12,11 +12,14 @@ 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) diff --git a/source4/lib/tdb/tdb.pc.in b/source4/lib/tdb/tdb.pc.in index 8180d47185..bb440f9cf5 100644 --- a/source4/lib/tdb/tdb.pc.in +++ b/source4/lib/tdb/tdb.pc.in @@ -5,6 +5,6 @@ includedir=@includedir@ Name: tdb Description: A trivial database -Version: 4.0 +Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ltdb Cflags: -I${includedir} |