Checking for GnuTLS version. Fixes #58

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891ae938a2587d670262c5cfbfb48feed19e962b..1c2130fd4437ff05a7a29f9e172c6dcce19aff90 100644 (file)
--- a/CMakeLists.txt
+++ b/CMakeLists.txt
@@ -44,7 +44,7 @@ elseif("${SSL}" STREQUAL "polarssl")
     set(SSLIMP_LIBRARY_DIR ${POLARSSL_LIB_DIR})
   endif(POLARSSL_FOUND)
 elseif("${SSL}" STREQUAL "gnutls")
-  find_package(GnuTLS REQUIRED)
+  find_package(GnuTLS 3 REQUIRED)
   if(GNUTLS_FOUND)
     set(USE_GNUTLS ON)
     set(SSLIMP_LIBRARIES ${GNUTLS_LIBRARIES})

diff --git a/configure.ac b/configure.ac
index 828ada658cc71e93700e3c4012fdc1d98ff7629c..72e6083a81b556503a507947480ba6d6050112ec 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -30,7 +30,7 @@
 
 # Process this file with autoconf to produce a configure script.
 AC_PREREQ([2.63])
-AC_INIT([umurmur], [0.2.15], [http://code.google.com/p/umurmur/issues/entry], [umurmur], [http://code.google.com/p/umurmur])
+AC_INIT([umurmur], [0.2.16], [https://github.com/umurmur/umurmur/issues/new], [umurmur], [http://github.com/umurmur/umurmur])
 AC_CONFIG_SRCDIR([src/client.h])
 AC_CONFIG_HEADERS([src/config.h])
 AM_INIT_AUTOMAKE
@@ -42,9 +42,6 @@ AC_ARG_ENABLE([shmapi], [AC_HELP_STRING([--enable-shmapi], [compile with Sharedm
 AC_ARG_ENABLE(polarssl-test-cert, [  --enable-polarssl-test-cert  Link to PolarSSL test certificate and key @<:@default=no@:>@], [enable_polarssl_test_cert=yes])
 AC_ARG_ENABLE(polarssl-havege, [  --enable-polarssl-havege  Link to PolarSSL HAVEGE random generator key @<:@default=no@:>@ Default: /dev/urandom], [enable_polarssl_havege=yes])
 
-
-
-
 # Checks for programs.
 AC_PROG_CC
 
@@ -91,6 +88,12 @@ AS_IF([test "x$with_ssl" = xopenssl], [
 ])
 AS_IF([test "x$with_ssl" = xgnutls], [
        AC_CHECK_HEADERS([gnutls/gnutls.h], [], [AC_MSG_ERROR([could not find gnutls/gnutls.h])])
+  AC_COMPILE_IFELSE([AC_LANG_PROGRAM([@%:@include <gnutls/gnutls.h>],
+                    [ #ifdef GNUTLS_E_PREMATURE_TERMINATION
+                      #else
+                      #error Unsuitable version of GnuTLS
+                      #endif
+                      ])], [], [AC_MSG_ERROR([Unsuitable version of GnuTL, minimum required is 3.0])])
        AC_CHECK_LIB([gnutls], [gnutls_priority_init], [], [AC_MSG_ERROR([could not find libgnutls])])
        AC_CHECK_LIB([nettle], [_nettle_aes_decrypt], [], [AC_MSG_ERROR([could not find libnettle])])
        AC_DEFINE([USE_GNUTLS], [], [Use GnuTLS])