diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-14 22:09:03 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-14 22:09:03 +0100 |
| commit | 1b19cd1360a5be0a27d5fe2154feae4dcfe29878 (patch) | |
| tree | 653b6930d7d760ef3b759ed4eb41fdf89a9708e6 /source3/configure.in | |
| parent | 4638633308e0508fa753173fa3e430c38e51732e (diff) | |
| parent | 4ceaec6725509dac4a5c71421dabea1da96b70ab (diff) | |
| download | samba-1b19cd1360a5be0a27d5fe2154feae4dcfe29878.tar.gz samba-1b19cd1360a5be0a27d5fe2154feae4dcfe29878.tar.bz2 samba-1b19cd1360a5be0a27d5fe2154feae4dcfe29878.zip | |
Merge branch 'checktalloc' into tdr
Diffstat (limited to 'source3/configure.in')
| -rw-r--r-- | source3/configure.in | 21 |
1 files changed, 20 insertions, 1 deletions
diff --git a/source3/configure.in b/source3/configure.in index e48ff34554..6d9e198244 100644 --- a/source3/configure.in +++ b/source3/configure.in @@ -20,10 +20,29 @@ AC_SUBST(builddir) m4_include(m4/samba_version.m4) m4_include(m4/check_path.m4) +m4_include(pkg.m4) AC_LIBREPLACE_CC_CHECKS -m4_include(../lib/talloc/libtalloc.m4) +AC_ARG_ENABLE(external_libtalloc, [AS_HELP_STRING([--enable-external-libtalloc], [Enable external talloc [default=auto]])], +[ enable_external_libtalloc=$enableval ], [ enable_external_libtalloc=auto ]) + +if test "x$enable_external_libtalloc" != xno +then + PKG_CHECK_MODULES(TALLOC, talloc >= 1.3.0, + [ enable_external_libtalloc=yes ], + [ if x$enable_external_libtalloc = xyes; then + AC_MSG_ERROR([Unable to find libtalloc]) + else + enable_external_libtalloc=no + fi + ]) +fi + +if test "x$enable_external_libtalloc" = xno +then + m4_include(../lib/talloc/libtalloc.m4) +fi LIBTALLOC_OBJ0="" for obj in ${TALLOC_OBJ}; do |