diff options
| author | Jelmer Vernooij <jelmer@samba.org> | 2009-03-15 13:52:01 +0100 |
|---|---|---|
| committer | Jelmer Vernooij <jelmer@samba.org> | 2009-03-15 13:52:01 +0100 |
| commit | 251bf8aab5eb89b1c36696fa661d7f105ab71923 (patch) | |
| tree | 64279d37e0656c6163f088175b26bf2a60452bdc /source3/configure.in | |
| parent | 8afd835cea1a8138a4e21702e610b0b0e9904700 (diff) | |
| parent | a3d2b77ddd9808b35300446cebca1b403ca56f78 (diff) | |
| download | samba-251bf8aab5eb89b1c36696fa661d7f105ab71923.tar.gz samba-251bf8aab5eb89b1c36696fa661d7f105ab71923.tar.xz samba-251bf8aab5eb89b1c36696fa661d7f105ab71923.zip | |
Merge branch 'checktalloc' of /home/jelmer/samba4
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 ab5e81fb3c..98f41d61e5 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 |