Author: jelmer Date: 2007-04-30 10:49:42 +0000 (Mon, 30 Apr 2007) New Revision: 22600
WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=22600 Log: Update bzr ignores, put right version in .pc files, prepare for support of system versions of tdb, talloc. Modified: branches/SAMBA_4_0/ branches/SAMBA_4_0/.bzrignore branches/SAMBA_4_0/source/lib/ldb/Makefile.in branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in branches/SAMBA_4_0/source/lib/popt/libpopt.m4 branches/SAMBA_4_0/source/lib/talloc/Makefile.in branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 branches/SAMBA_4_0/source/lib/talloc/talloc.pc.in branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt branches/SAMBA_4_0/source/lib/tdb/Makefile.in branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 branches/SAMBA_4_0/source/lib/tdb/tdb.pc.in Changeset: Property changes on: branches/SAMBA_4_0 ___________________________________________________________________ Name: bzr:merge ...skipped... Modified: branches/SAMBA_4_0/.bzrignore =================================================================== --- branches/SAMBA_4_0/.bzrignore 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/.bzrignore 2007-04-30 10:49:42 UTC (rev 22600) @@ -171,3 +171,12 @@ source/bin/modules/* source/tests source/torture/unix/proto.h +source/lib/tdb/bin/tdbtool +source/lib/tdb/bin/tdbtorture +source/lib/talloc/testsuite +source/lib/talloc/talloc.3.html +source/lib/ldb/tests/tmp +source/lib/ldb/man/*.html +source/lib/ldb/lib +source/lib/ldb/examples/ldbreader +source/lib/ldb/examples/ldifreader Modified: branches/SAMBA_4_0/source/lib/ldb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/ldb/Makefile.in 2007-04-30 10:49:42 UTC (rev 22600) @@ -20,18 +20,21 @@ 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=\"@[EMAIL PROTECTED]" -DUSE_MMAP=1 @CFLAGS@ [EMAIL PROTECTED]@ -Llib -lldb @LIBS@ $(POPT_LIBS) [EMAIL PROTECTED]@ -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 @@ 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 @@ 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) Modified: branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in =================================================================== --- branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/ldb/ldb.pc.in 2007-04-30 10:49:42 UTC (rev 22600) @@ -6,7 +6,7 @@ Name: ldb Description: An LDAP-like embedded database -Version: 4.0 +Version: @PACKAGE_VERSION@ Requires.private: tdb Requires: talloc Libs: -L${libdir} -lldb Modified: branches/SAMBA_4_0/source/lib/popt/libpopt.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/popt/libpopt.m4 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/popt/libpopt.m4 2007-04-30 10:49:42 UTC (rev 22600) @@ -37,7 +37,7 @@ 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 Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/Makefile.in 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in 2007-04-30 10:49:42 UTC (rev 22600) @@ -17,7 +17,7 @@ .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 @@ @-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 Modified: branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/talloc/libtalloc.m4 2007-04-30 10:49:42 UTC (rev 22600) @@ -12,12 +12,15 @@ 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) Modified: branches/SAMBA_4_0/source/lib/talloc/talloc.pc.in =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/talloc.pc.in 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/talloc/talloc.pc.in 2007-04-30 10:49:42 UTC (rev 22600) @@ -5,7 +5,7 @@ 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/ Modified: branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt =================================================================== --- branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/talloc/talloc_guide.txt 2007-04-30 10:49:42 UTC (rev 22600) @@ -12,7 +12,7 @@ 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 Modified: branches/SAMBA_4_0/source/lib/tdb/Makefile.in =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/tdb/Makefile.in 2007-04-30 10:49:42 UTC (rev 22600) @@ -23,7 +23,7 @@ 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 Modified: branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/tdb/libtdb.m4 2007-04-30 10:49:42 UTC (rev 22600) @@ -12,11 +12,14 @@ 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) Modified: branches/SAMBA_4_0/source/lib/tdb/tdb.pc.in =================================================================== --- branches/SAMBA_4_0/source/lib/tdb/tdb.pc.in 2007-04-30 10:23:20 UTC (rev 22599) +++ branches/SAMBA_4_0/source/lib/tdb/tdb.pc.in 2007-04-30 10:49:42 UTC (rev 22600) @@ -5,6 +5,6 @@ Name: tdb Description: A trivial database -Version: 4.0 +Version: @PACKAGE_VERSION@ Libs: -L${libdir} -ltdb Cflags: -I${includedir}
