svn commit: samba r18076 - in branches/SAMBA_4_0/source/lib/talloc: .

tridge at samba.org tridge at samba.org
Tue Sep 5 11:34:46 GMT 2006


Author: tridge
Date: 2006-09-05 11:34:43 +0000 (Tue, 05 Sep 2006)
New Revision: 18076

WebSVN: http://websvn.samba.org/cgi-bin/viewcvs.cgi?view=rev&root=samba&rev=18076

Log:

convert talloc to the new libreplace system

Modified:
   branches/SAMBA_4_0/source/lib/talloc/Makefile.in
   branches/SAMBA_4_0/source/lib/talloc/autogen.sh
   branches/SAMBA_4_0/source/lib/talloc/config.m4
   branches/SAMBA_4_0/source/lib/talloc/configure.ac


Changeset:
Modified: branches/SAMBA_4_0/source/lib/talloc/Makefile.in
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2006-09-05 11:33:46 UTC (rev 18075)
+++ branches/SAMBA_4_0/source/lib/talloc/Makefile.in	2006-09-05 11:34:43 UTC (rev 18076)
@@ -6,18 +6,18 @@
 includedir = @includedir@
 libdir = @libdir@
 mandir = @mandir@
-VPATH = @srcdir@
+VPATH = @srcdir@:@libreplacedir@
 srcdir = @srcdir@
 builddir = @builddir@
 XSLTPROC = @XSLTPROC@
 INSTALLCMD = @INSTALL@
 CC = @CC@
-CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I$(srcdir) -I.
+CFLAGS = @CFLAGS@ -DHAVE_CONFIG_H= -I. -I at srcdir@ -I at libreplacedir@
 EXTRA_TARGETS = @DOC_TARGET@
 
 .SUFFIXES: .c .o .3 .3.xml .xml .html
 
-LIBOBJ = talloc.o
+LIBOBJ = @TALLOCOBJ@ @LIBREPLACEOBJ@
 
 all: libtalloc.a testsuite $(EXTRA_TARGETS)
 
@@ -46,7 +46,7 @@
 	-test -z "$(XSLTPROC)" || $(XSLTPROC) --nonet -o $@ http://docbook.sourceforge.net/release/xsl/current/html/docbook.xsl $<
 
 clean:
-	rm -f *~ *.o libtalloc.a testsuite *.gc?? talloc.3 talloc.3.html
+	rm -f *~ $(LIBOBJ) libtalloc.a testsuite *.gc?? talloc.3 talloc.3.html
 
 test: testsuite
 	./testsuite

Modified: branches/SAMBA_4_0/source/lib/talloc/autogen.sh
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/autogen.sh	2006-09-05 11:33:46 UTC (rev 18075)
+++ branches/SAMBA_4_0/source/lib/talloc/autogen.sh	2006-09-05 11:34:43 UTC (rev 18076)
@@ -1,7 +1,8 @@
 #!/bin/sh
 
-autoconf || exit 1
-autoheader || exit 1
+IPATHS="-I libreplace -I lib/replace -I ../libreplace -I ../replace"
+autoconf $IPATHS || exit 1
+autoheader $IPATHS || exit 1
 
 echo "Now run ./configure and then make."
 exit 0

Modified: branches/SAMBA_4_0/source/lib/talloc/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/config.m4	2006-09-05 11:33:46 UTC (rev 18075)
+++ branches/SAMBA_4_0/source/lib/talloc/config.m4	2006-09-05 11:34:43 UTC (rev 18076)
@@ -1,3 +1,16 @@
+dnl find the talloc sources. This is meant to work both for 
+dnl talloc standalone builds, and builds of packages using talloc
+tallocdir=""
+for d in "$srcdir" "$srcdir/lib/talloc" "$srcdir/talloc" "$srcdir/../talloc"; do
+	if test -f "$d/talloc.c"; then
+		tallocdir="$d"		
+		AC_SUBST(tallocdir)
+		break;
+	fi
+done
+TALLOCOBJ="talloc.o"
+AC_SUBST(TALLOCOBJ)
+
 AC_CHECK_HEADERS(stdarg.h vararg.h)
 
 dnl VA_COPY

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.ac	2006-09-05 11:33:46 UTC (rev 18075)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.ac	2006-09-05 11:34:43 UTC (rev 18076)
@@ -13,7 +13,9 @@
 	DOC_TARGET=doc
 fi
 AC_SUBST(DOC_TARGET)
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADER(talloc_config.h)
 AC_SYS_LARGEFILE
 sinclude(config.m4)
+
+sinclude(libreplace.m4)
 AC_OUTPUT(Makefile talloc.pc)



More information about the samba-cvs mailing list