svn commit: samba r22721 - in branches/SAMBA_4_0/source: .

metze at samba.org metze at samba.org
Sun May 6 21:26:45 GMT 2007


Author: metze
Date: 2007-05-06 21:26:42 +0000 (Sun, 06 May 2007)
New Revision: 22721

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

Log:
use only included talloc and tdb untill jelmer
fixes the code to support both...

the problem is that we always add EXT::TALLOC in config.mk
before 'include lib/talloc/config.mk'

metze
Modified:
   branches/SAMBA_4_0/source/configure.ac


Changeset:
Modified: branches/SAMBA_4_0/source/configure.ac
===================================================================
--- branches/SAMBA_4_0/source/configure.ac	2007-05-06 21:26:01 UTC (rev 22720)
+++ branches/SAMBA_4_0/source/configure.ac	2007-05-06 21:26:42 UTC (rev 22721)
@@ -26,17 +26,19 @@
 m4_include(lib/charset/config.m4)
 m4_include(lib/socket/config.m4)
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
-			   [samba_cv_internal_talloc=no],
-			   [samba_cv_internal_talloc=yes])
+#SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0,
+#			   [samba_cv_internal_talloc=no],
+#			   [samba_cv_internal_talloc=yes])
+samba_cv_internal_talloc=yes
 if test x"$samba_cv_internal_talloc" = x"yes"; then
 	m4_include(lib/talloc/libtalloc.m4)
 	SMB_INCLUDE_MK(lib/talloc/config.mk)
 fi
 
-SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
-			   [samba_cv_internal_tdb=no],
-			   [samba_cv_internal_tdb=yes])
+#SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0,
+#			   [samba_cv_internal_tdb=no],
+#			   [samba_cv_internal_tdb=yes])
+samba_cv_internal_tdb=yes
 if test x"$samba_cv_internal_tdb" = x"yes"; then
 	m4_include(lib/tdb/libtdb.m4)
 	SMB_INCLUDE_MK(lib/tdb/config.mk)



More information about the samba-cvs mailing list