From: Felix Morgner <felix.morgner@gmail.com>
Date: Tue, 7 Apr 2015 09:37:56 +0000 (+0200)
Subject: Checking for GnuTLS version. Fixes #58
X-Git-Url: http://git.code-monkey.de/?p=umurmur.git;a=commitdiff_plain;h=64836bc231d494d6070b1207a9b584e113f0610e

Checking for GnuTLS version. Fixes #58
---

diff --git a/CMakeLists.txt b/CMakeLists.txt
index 891ae93..1c2130f 100644
--- 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 828ada6..72e6083 100644
--- 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])