r22721: use only included talloc and tdb untill jelmer
authorStefan Metzmacher <metze@samba.org>
Sun, 6 May 2007 21:26:42 +0000 (21:26 +0000)
committerGerald (Jerry) Carter <jerry@samba.org>
Wed, 10 Oct 2007 19:52:06 +0000 (14:52 -0500)
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

source/configure.ac

index a2b547154dc1648da5a87584e3589962b65fe4a2..6871b81dcf763f954cbf7b0e13f42aa0b94a7f2b 100644 (file)
@@ -26,17 +26,19 @@ m4_include(lib/popt/samba.m4)
 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)