diff options
| author | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-11-03 13:55:51 +0100 |
|---|---|---|
| committer | Nikos Mavrogiannopoulos <nmav@gnutls.org> | 2012-11-03 13:55:51 +0100 |
| commit | 0ae4fd86b80bd2b9f55dd52c30201983cce050ce (patch) | |
| tree | 6a93b48c4e837babb37c338740c3b6988aa30342 | |
| parent | 50a53427580d3ead5a38e492966bad0524e56d19 (diff) | |
| download | gnutls-0ae4fd86b80bd2b9f55dd52c30201983cce050ce.tar.gz | |
depend on libtasn1 2.14 or later.
| -rw-r--r-- | NEWS | 9 | ||||
| -rw-r--r-- | lib/m4/hooks.m4 | 6 |
2 files changed, 11 insertions, 4 deletions
@@ -3,6 +3,15 @@ Copyright (C) 2000, 2001, 2002, 2003, 2004, 2005, 2006, 2007, 2008, 2009, 2010, 2011 Free Software Foundation, Inc. See the end for copying conditions. +Version 2.12.21 (unreleased) + +** libgnutls: Backported patch to compile with libtasn1 3.0. +Minimum libtasn1 dependency is now 2.14. + +** API and ABI modifications: +No changes since last version. + + Version 2.12.20 (released 2012-06-10) ** libgnutls: Fixed memory leak in PKCS #8 key import. diff --git a/lib/m4/hooks.m4 b/lib/m4/hooks.m4 index e921f7198f..30c29c8189 100644 --- a/lib/m4/hooks.m4 +++ b/lib/m4/hooks.m4 @@ -86,10 +86,8 @@ fi included_libtasn1=$withval, included_libtasn1=no) if test "$included_libtasn1" = "no"; then - AC_LIB_HAVE_LINKFLAGS(tasn1,, [#include <libtasn1.h>], - [asn1_check_version (NULL)]) - if test "$ac_cv_libtasn1" != yes; then - included_libtasn1=yes + PKG_CHECK_MODULES(LIBTASN1, [libtasn1 >= 2.14], [], [included_libtasn1=yes]) + if test "$included_libtasn1" = yes; then AC_MSG_WARN([[ *** *** Libtasn1 was not found. Will use the included one. |