diff options
| author | Stefan Metzmacher <metze@samba.org> | 2007-05-06 21:26:42 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 14:52:06 -0500 |
| commit | c722b7ad60300a724c628882162066f16265937e (patch) | |
| tree | 2de008853bcc43823bd8ab45c85498c493508021 | |
| parent | aed8091df0e3a6ffdc1bf1dd5771088317abda77 (diff) | |
| download | samba-c722b7ad60300a724c628882162066f16265937e.tar.gz samba-c722b7ad60300a724c628882162066f16265937e.tar.bz2 samba-c722b7ad60300a724c628882162066f16265937e.zip | |
r22721: 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
(This used to be commit fa5b22e0c63f8fb06bfee1cfd7ca20cf5c34f1d4)
| -rw-r--r-- | source4/configure.ac | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index a2b547154d..6871b81dcf 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -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) |