From 42cf31f3c695913b68500302ebb2dc6cd0df4464 Mon Sep 17 00:00:00 2001
From: Jelmer Vernooij <jelmer@samba.org>
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/talloc/Makefile.in      | 8 ++++----
 source4/lib/talloc/libtalloc.m4     | 7 +++++--
 source4/lib/talloc/talloc.pc.in     | 2 +-
 source4/lib/talloc/talloc_guide.txt | 2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)

(limited to 'source4/lib/talloc')

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
-- 
cgit