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/ldb | |
| 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/ldb')
| -rw-r--r-- | source4/lib/ldb/Makefile.in | 9 | ||||
| -rw-r--r-- | source4/lib/ldb/ldb.pc.in | 2 |
2 files changed, 7 insertions, 4 deletions
diff --git a/source4/lib/ldb/Makefile.in b/source4/lib/ldb/Makefile.in index df86b9988c..78bc9d0134 100644 --- a/source4/lib/ldb/Makefile.in +++ b/source4/lib/ldb/Makefile.in @@ -20,18 +20,21 @@ TESTS=test-tdb.sh @TESTS@ TALLOC_LIBS = @TALLOC_LIBS@ TALLOC_CFLAGS = @TALLOC_CFLAGS@ +TALLOC_OBJ = @TALLOC_OBJ@ TDB_LIBS = @TDB_LIBS@ TDB_CFLAGS = @TDB_CFLAGS@ +TDB_OBJ = @TDB_OBJ@ POPT_LIBS = @POPT_LIBS@ POPT_CFLAGS = @POPT_CFLAGS@ +POPT_OBJ = @POPT_OBJ@ CFLAGS=-g -I$(srcdir)/include -Iinclude -I$(srcdir) -I$(srcdir)/.. \ $(POPT_CFLAGS) $(TALLOC_CFLAGS) $(TDB_CFLAGS) \ -DLIBDIR=\"$(libdir)\" -DSHLIBEXT=\"@SHLIBEXT@\" -DUSE_MMAP=1 @CFLAGS@ -LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS) +LIB_FLAGS=@LDFLAGS@ -Llib -lldb @LIBS@ $(POPT_LIBS) $(TALLOC_LIBS) $(TDB_LIBS) LDB_TDB_DIR=ldb_tdb LDB_TDB_OBJ=$(LDB_TDB_DIR)/ldb_tdb.o \ @@ -54,7 +57,7 @@ NSSDIR=nssldb NSS_OBJ= $(NSSDIR)/ldb-nss.o $(NSSDIR)/ldb-pwd.o $(NSSDIR)/ldb-grp.o NSS_LIB = lib/libnss_ldb.so.2 -OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) @TDBOBJ@ @TALLOCOBJ@ @POPTOBJ@ @LIBREPLACEOBJ@ $(EXTRA_OBJ) +OBJS = $(MODULES_OBJ) $(COMMON_OBJ) $(LDB_TDB_OBJ) $(TDB_OBJ) $(TALLOC_OBJ) $(POPT_OBJ) @LIBREPLACEOBJ@ $(EXTRA_OBJ) LDB_LIB = lib/libldb.a @@ -92,7 +95,7 @@ lib/libldb.a: $(OBJS) ar -rv $@ $(OBJS) @-ranlib $@ -lib/libnss_ldb.so.2: $(NSS_OBJ) $(LIBS) +lib/libnss_ldb.so.2: $(NSS_OBJ) $(LIBS) bin/libldb.a $(CC) -shared -Wl,-soname,libnss_ldb.so.2 -o lib/libnss_ldb.so.2 $(NSS_OBJ) $(OBJS) $(LIB_FLAGS) bin/ldbadd: tools/ldbadd.o tools/cmdline.o $(LIBS) diff --git a/source4/lib/ldb/ldb.pc.in b/source4/lib/ldb/ldb.pc.in index 815d663a7c..fb59f82698 100644 --- a/source4/lib/ldb/ldb.pc.in +++ b/source4/lib/ldb/ldb.pc.in @@ -6,7 +6,7 @@ modulesdir=@modulesdir@ Name: ldb Description: An LDAP-like embedded database -Version: 4.0 +Version: @PACKAGE_VERSION@ Requires.private: tdb Requires: talloc Libs: -L${libdir} -lldb |