summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--NEWS8
-rw-r--r--configure.ac6
-rw-r--r--cross.mk4
-rw-r--r--m4/hooks.m42
4 files changed, 14 insertions, 6 deletions
diff --git a/NEWS b/NEWS
index 695a8ae347..490660d86e 100644
--- a/NEWS
+++ b/NEWS
@@ -2,6 +2,14 @@ GnuTLS NEWS -- History of user-visible changes. -*- outline -*-
Copyright (C) 2000-2012 Free Software Foundation, Inc.
See the end for copying conditions.
+* Version 3.0.17 (released 2012-03-17)
+
+** command line apps: Always link with local libopts.
+
+** API and ABI modifications:
+No changes since last version.
+
+
* Version 3.0.16 (released 2012-03-16)
** minitasn1: Upgraded to libtasn1 version 2.12 (pre-release).
diff --git a/configure.ac b/configure.ac
index 30384a86e6..83c35771a2 100644
--- a/configure.ac
+++ b/configure.ac
@@ -21,7 +21,7 @@ dnl Process this file with autoconf to produce a configure script.
# USA
AC_PREREQ(2.61)
-AC_INIT([GnuTLS], [3.0.16], [bug-gnutls@gnu.org])
+AC_INIT([GnuTLS], [3.0.17], [bug-gnutls@gnu.org])
AC_CONFIG_AUX_DIR([build-aux])
AC_CONFIG_MACRO_DIR([m4])
@@ -153,8 +153,8 @@ fi
AM_CONDITIONAL(ENABLE_PKCS11, test "$with_p11_kit" != "no")
-enable_local_libopts=no
-PKG_CHECK_MODULES([autoopts], autoopts >= 36.2.11,, [enable_local_libopts=yes])
+enable_local_libopts=yes
+dnl PKG_CHECK_MODULES([autoopts], autoopts >= 36.2.11,, [enable_local_libopts=yes])
NEED_LIBOPTS_DIR=true
LIBOPTS_CHECK([src/libopts])
diff --git a/cross.mk b/cross.mk
index 5cb4a04b8a..006bf90438 100644
--- a/cross.mk
+++ b/cross.mk
@@ -1,6 +1,6 @@
-GNUTLS_FILE:=gnutls-3.0.15.tar.xz
-GNUTLS_DIR:=gnutls-3.0.15
+GNUTLS_FILE:=gnutls-3.0.17.tar.xz
+GNUTLS_DIR:=gnutls-3.0.17
GMP_FILE:=gmp-5.0.2.tar.bz2
GMP_DIR:=gmp-5.0.2
diff --git a/m4/hooks.m4 b/m4/hooks.m4
index aaf2a61954..081380f867 100644
--- a/m4/hooks.m4
+++ b/m4/hooks.m4
@@ -40,7 +40,7 @@ AC_DEFUN([LIBGNUTLS_HOOKS],
# Interfaces added: AGE++
# Interfaces removed: AGE=0
AC_SUBST(LT_CURRENT, 35)
- AC_SUBST(LT_REVISION, 0)
+ AC_SUBST(LT_REVISION, 1)
AC_SUBST(LT_AGE, 7)
AC_SUBST(LT_SSL_CURRENT, 27)