diff options
| author | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 10:46:46 +1100 |
|---|---|---|
| committer | Andrew Bartlett <abartlet@samba.org> | 2009-03-05 10:46:46 +1100 |
| commit | 92bb91a6115ac035e3c37e471931c2a388dc843e (patch) | |
| tree | d4f482b4272acac26739e9e608796d10c27b601b | |
| parent | 5a9f668dabb62efd70054dc35d19c60d027793b5 (diff) | |
| download | samba-92bb91a6115ac035e3c37e471931c2a388dc843e.tar.gz samba-92bb91a6115ac035e3c37e471931c2a388dc843e.tar.bz2 samba-92bb91a6115ac035e3c37e471931c2a388dc843e.zip | |
Update talloc version so we don't fail on system talloc 1.2.0
The problem is that talloc in the Samba tree now includes
talloc_get_type_abort(), which is not present on Fedora 10 or ubuntu's
talloc 1.2.0.
Andrew Bartlett
| -rw-r--r-- | lib/talloc/configure.ac | 2 | ||||
| -rw-r--r-- | source4/configure.ac | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/lib/talloc/configure.ac b/lib/talloc/configure.ac index d2538f9222..39cea393ce 100644 --- a/lib/talloc/configure.ac +++ b/lib/talloc/configure.ac @@ -1,5 +1,5 @@ AC_PREREQ(2.50) -AC_INIT(talloc, 1.2.0) +AC_INIT(talloc, 1.2.1) AC_CONFIG_SRCDIR([talloc.c]) AC_SUBST(datarootdir) AC_CONFIG_HEADER(config.h) diff --git a/source4/configure.ac b/source4/configure.ac index 54ca9108b1..d33df08406 100644 --- a/source4/configure.ac +++ b/source4/configure.ac @@ -42,7 +42,7 @@ AC_CONFIG_FILES(param/samba-hostconfig.pc) AC_CONFIG_FILES(librpc/dcerpc_samr.pc) AC_CONFIG_FILES(librpc/dcerpc_atsvc.pc) -SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.0, [], +SMB_INCLUDED_LIB_PKGCONFIG(LIBTALLOC, talloc >= 1.2.1, [], [ m4_include(../lib/talloc/libtalloc.m4) SMB_INCLUDE_MK(../lib/talloc/config.mk) |