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

[tridge at samba.org]

Author: tridge
Date: 2006-09-05 11:52:28 +0000 (Tue, 05 Sep 2006)
New Revision: 18082

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

Log:

bring talloc in line with new conventions

Added:
   branches/SAMBA_4_0/source/lib/talloc/libtdb.m4
Removed:
   branches/SAMBA_4_0/source/lib/talloc/config.m4
Modified:
   branches/SAMBA_4_0/source/lib/talloc/configure.ac


Changeset:
Deleted: branches/SAMBA_4_0/source/lib/talloc/config.m4
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/config.m4	2006-09-05 11:51:00 UTC (rev 18081)
+++ branches/SAMBA_4_0/source/lib/talloc/config.m4	2006-09-05 11:52:28 UTC (rev 18082)
@@ -1,23 +0,0 @@
-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_SIZEOF(size_t,cross)
-AC_CHECK_SIZEOF(void *,cross)
-
-if test $ac_cv_sizeof_size_t -lt $ac_cv_sizeof_void_p; then
-	AC_WARN([size_t cannot represent the amount of used memory of a process])
-	AC_WARN([please report this to <samba-technical at samba.org>])
-	AC_WARN([sizeof(size_t) = $ac_cv_sizeof_size_t])
-	AC_WARN([sizeof(void *) = $ac_cv_sizeof_void_p])
-	AC_ERROR([sizeof(size_t) < sizeof(void *)])
-fi

Modified: branches/SAMBA_4_0/source/lib/talloc/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/lib/talloc/configure.ac	2006-09-05 11:51:00 UTC (rev 18081)
+++ branches/SAMBA_4_0/source/lib/talloc/configure.ac	2006-09-05 11:52:28 UTC (rev 18082)
@@ -13,9 +13,10 @@
 	DOC_TARGET=doc
 fi
 AC_SUBST(DOC_TARGET)
-AC_CONFIG_HEADER(talloc_config.h)
+AC_CONFIG_HEADER(config.h)
 AC_SYS_LARGEFILE
-sinclude(config.m4)
 
 sinclude(libreplace.m4)
+sinclude(libtdb.m4)
+
 AC_OUTPUT(Makefile talloc.pc)

Copied: branches/SAMBA_4_0/source/lib/talloc/libtdb.m4 (from rev 18077, branches/SAMBA_4_0/source/lib/talloc/config.m4)