diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2007-09-07 14:25:03 +0000 |
|---|---|---|
| committer | Gerald (Jerry) Carter <jerry@samba.org> | 2007-10-10 15:05:27 -0500 |
| commit | 6c79213eb80283bb211d2e2161c25337c0a549b7 (patch) | |
| tree | b1b18ace88dac6317e91b8218dfb8bd8635bb4c7 /source4/configure.ac | |
| parent | 9c7ae7ec554943f75f814fbb925b4715bbb41232 (diff) | |
| download | samba-6c79213eb80283bb211d2e2161c25337c0a549b7.tar.gz samba-6c79213eb80283bb211d2e2161c25337c0a549b7.tar.bz2 samba-6c79213eb80283bb211d2e2161c25337c0a549b7.zip | |
r24997: Re-enable use of system-provided tdb and/or talloc when available.
(This used to be commit 0a3b53fd2cbd15c1e5839990e721bbe4d2f7d4af)
Diffstat (limited to 'source4/configure.ac')
| -rw-r--r-- | source4/configure.ac | 32 |
1 files changed, 15 insertions, 17 deletions
diff --git a/source4/configure.ac b/source4/configure.ac index c947a1629a..bb326985f3 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -27,23 +27,21 @@ m4_include(lib/charset/config.m4) m4_include(lib/socket/config.m4) m4_include(nsswitch/nsstest.m4) -#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]) -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) -fi +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTALLOC, talloc >= 1.0, + [], + [ + m4_include(lib/talloc/libtalloc.m4) + SMB_INCLUDE_MK(lib/talloc/config.mk) + ] +) + +SMB_EXT_LIB_FROM_PKGCONFIG(LIBTDB, tdb >= 1.1.0, + [], + [ + m4_include(lib/tdb/libtdb.m4) + SMB_INCLUDE_MK(lib/tdb/config.mk) + ] +) m4_include(lib/ldb/sqlite3.m4) m4_include(lib/ldb/libldb.m4) |