X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=configure.ac;h=245bccd951dd9d117bf243aefb2b66df50a1da0b;hb=8cb6ebb5b1511db0e10b34cfd2641b6d7349acf0;hp=5b612ca06671235260663a0f4ad67f706b532b3e;hpb=2311400db89f8dd24cfc57d6f72328f539a9ce8d;p=umurmur.git

diff --git a/configure.ac b/configure.ac
index 5b612ca..245bccd 100644
--- a/configure.ac
+++ b/configure.ac
@@ -30,21 +30,19 @@
 
 # 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])
+AC_CONFIG_HEADERS([src/config.h:config.h.in])
 AM_INIT_AUTOMAKE
 AC_CANONICAL_HOST
+AM_SILENT_RULES([yes])
 
 # Configure options.
-AC_ARG_WITH([ssl], [AC_HELP_STRING([--with-ssl=@<:@LIB@:>@], [SSL library (openssl|polarssl) @<:@default=polarssl@:>@])], [], [with_ssl=polarssl])
+AC_ARG_WITH([ssl], [AC_HELP_STRING([--with-ssl=@<:@LIB@:>@], [SSL library (openssl|polarssl|gnutls) @<:@default=polarssl@:>@])], [], [with_ssl=polarssl])
 AC_ARG_ENABLE([shmapi], [AC_HELP_STRING([--enable-shmapi], [compile with Sharedmemory API support @<:@default=no@:>@])],[],[enable_shmapi=no] )
 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
 
@@ -56,6 +54,7 @@ AC_CHECK_LIB([config], [config_init], [], [AC_MSG_ERROR([could not find libconfi
 case $host_os in
   darwin* )
     AC_CHECK_FUNC([clock_get_time], [], [AC_MSG_ERROR([could not find clock_get_time()])])
+    CFLAGS+=" -Wno-deprecated-declarations"
     ;;
   * )
     AC_CHECK_FUNC([clock_gettime], [], [AC_CHECK_LIB([rt], [clock_gettime], [], [AC_MSG_ERROR([could not find clock_gettime() in librt])])])
@@ -89,6 +88,18 @@ AS_IF([test "x$with_ssl" = xopenssl], [
 	AC_CHECK_LIB([crypto], [BN_init], [], [AC_MSG_ERROR([could not find libcrypto])])
 	AC_CHECK_LIB([ssl], [SSL_library_init], [], [AC_MSG_ERROR([could not find libssl])])
 ])
+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])
+])
 
 AM_CONDITIONAL(USE_OPENSSL, test x$with_ssl = xopenssl)
 AM_CONDITIONAL(USE_GNUTLS, test x$with_ssl = xgnutls)
@@ -97,12 +108,11 @@ AS_IF([test "x$enable_shmapi" != xno],
 	[
 	AM_CONDITIONAL(USE_SHAREDMEMORY_API, true)
 	AC_DEFINE([USE_SHAREDMEMORY_API],[],[Use sharedmemory API])
+    AC_CHECK_FUNC([shm_open], [], [AC_CHECK_LIB([rt], [shm_open], [], [AC_MSG_ERROR([could not find shm_open() in librt])])])
 	], [
 	AM_CONDITIONAL(USE_SHAREDMEMORY_API, false)
 ])
 
-
-
 AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config])
 
 # Checks for header files.