From 42cf31f3c695913b68500302ebb2dc6cd0df4464 Mon Sep 17 00:00:00 2001 From: Jelmer Vernooij Date: Mon, 30 Apr 2007 10:49:42 +0000 Subject: 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) --- source4/lib/ldb/Makefile.in | 9 ++++++--- source4/lib/ldb/ldb.pc.in | 2 +- source4/lib/popt/libpopt.m4 | 4 ++-- source4/lib/talloc/Makefile.in | 8 ++++---- source4/lib/talloc/libtalloc.m4 | 7 +++++-- source4/lib/talloc/talloc.pc.in | 2 +- source4/lib/talloc/talloc_guide.txt | 2 +- source4/lib/tdb/Makefile.in | 2 +- source4/lib/tdb/libtdb.m4 | 9 ++++++--- source4/lib/tdb/tdb.pc.in | 2 +- 10 files changed, 28 insertions(+), 19 deletions(-) (limited to 'source4') 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 diff --git a/source4/lib/popt/libpopt.m4 b/source4/lib/popt/libpopt.m4 index b3e2df519b..79980d1d6b 100644 --- a/source4/lib/popt/libpopt.m4 +++ b/source4/lib/popt/libpopt.m4 @@ -37,7 +37,7 @@ if test x"$INCLUDED_POPT" != x"no"; then if test x"$poptdir" = "x"; then AC_MSG_ERROR([cannot find popt source in $poptpaths]) fi - POPTOBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o" - AC_SUBST(POPTOBJ) + POPT_OBJ="popt.o findme.o poptconfig.o popthelp.o poptparse.o" + AC_SUBST(POPT_OBJ) AC_CHECK_HEADERS([float.h alloca.h]) fi diff --git a/source4/lib/talloc/Makefile.in b/source4/lib/talloc/Makefile.in index c6aa40cde2..18b48c3459 100644 --- a/source4/lib/talloc/Makefile.in +++ b/source4/lib/talloc/Makefile.in @@ -17,7 +17,7 @@ EXTRA_TARGETS = @DOC_TARGET@ .SUFFIXES: .c .o .3 .3.xml .xml .html -LIBOBJ = @TALLOCOBJ@ @LIBREPLACEOBJ@ +LIBOBJ = @TALLOC_OBJ@ @LIBREPLACEOBJ@ all: showflags libtalloc.a testsuite $(EXTRA_TARGETS) @@ -34,13 +34,13 @@ libtalloc.a: $(LIBOBJ) @-ranlib $@ install: all - ${INSTALLCMD} -d $(DESTDIR)${libdir} - ${INSTALLCMD} -d $(DESTDIR)${libdir}/pkgconfig + ${INSTALLCMD} -d $(DESTDIR)$(libdir) + ${INSTALLCMD} -d $(DESTDIR)$(libdir)/pkgconfig ${INSTALLCMD} -m 755 libtalloc.a $(DESTDIR)$(libdir) ${INSTALLCMD} -d $(DESTDIR)${includedir} ${INSTALLCMD} -m 644 $(srcdir)/talloc.h $(DESTDIR)$(includedir) ${INSTALLCMD} -m 644 talloc.pc $(DESTDIR)$(libdir)/pkgconfig - if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)${mandir}/man3; fi + if [ -f talloc.3 ];then ${INSTALLCMD} -d $(DESTDIR)$(mandir)/man3; fi if [ -f talloc.3 ];then ${INSTALLCMD} -m 644 talloc.3 $(DESTDIR)$(mandir)/man3; fi doc: talloc.3 talloc.3.html diff --git a/source4/lib/talloc/libtalloc.m4 b/source4/lib/talloc/libtalloc.m4 index d364729ec0..d2e8eba81a 100644 --- a/source4/lib/talloc/libtalloc.m4 +++ b/source4/lib/talloc/libtalloc.m4 @@ -12,12 +12,15 @@ done if test x"$tallocdir" = "x"; then AC_MSG_ERROR([cannot find talloc source in $tallocpaths]) fi -TALLOCOBJ="talloc.o" -AC_SUBST(TALLOCOBJ) +TALLOC_OBJ="talloc.o" +AC_SUBST(TALLOC_OBJ) TALLOC_CFLAGS="-I$tallocdir" AC_SUBST(TALLOC_CFLAGS) +TALLOC_LIBS="" +AC_SUBST(TALLOC_LIBS) + AC_CHECK_SIZEOF(size_t,cross) AC_CHECK_SIZEOF(void *,cross) diff --git a/source4/lib/talloc/talloc.pc.in b/source4/lib/talloc/talloc.pc.in index f93036a33d..459cce70b1 100644 --- a/source4/lib/talloc/talloc.pc.in +++ b/source4/lib/talloc/talloc.pc.in @@ -5,7 +5,7 @@ includedir=@includedir@ Name: talloc Description: A hierarchical pool based memory system with destructors -Version: 4.0 +Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ltalloc Cflags: -I${includedir} URL: http://talloc.samba.org/ diff --git a/source4/lib/talloc/talloc_guide.txt b/source4/lib/talloc/talloc_guide.txt index 8b252e4ab9..6481b58611 100644 --- a/source4/lib/talloc/talloc_guide.txt +++ b/source4/lib/talloc/talloc_guide.txt @@ -12,7 +12,7 @@ this carefully, as talloc has changed a lot. With 3.0.20 (or 3.0.14?) the Samba4 talloc has been ported back to Samba3, so this guide applies to both. The new talloc is a hierarchical, reference counted memory pool system -with destructors. Quite a mounthful really, but not too bad once you +with destructors. Quite a mouthful really, but not too bad once you get used to it. Perhaps the biggest change from Samba3 is that there is no distinction 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} -- cgit