X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=configure.ac;h=c2404cb9737d27a225cb641abb8530642a7ebdbd;hb=a2b4d7211b8c71ce05504f077420ddbf2b1355f4;hp=d7f5f7603efc2a4c8632902ced4d31ac9f7ac793;hpb=947de6a51fb26ad72ddf4216635947dcd05b5584;p=umurmur.git diff --git a/configure.ac b/configure.ac index d7f5f76..c2404cb 100644 --- a/configure.ac +++ b/configure.ac @@ -29,7 +29,7 @@ # Process this file with autoconf to produce a configure script. AC_PREREQ([2.63]) -AC_INIT([umurmur], [0.2.11], [http://code.google.com/p/umurmur/issues/entry], [umurmur], [http://code.google.com/p/umurmur]) +AC_INIT([umurmur], [0.2.13], [http://code.google.com/p/umurmur/issues/entry], [umurmur], [http://code.google.com/p/umurmur]) AC_CONFIG_SRCDIR([src/client.h]) AC_CONFIG_HEADERS([config.h]) AM_INIT_AUTOMAKE @@ -37,6 +37,7 @@ AM_INIT_AUTOMAKE # Configure options. AC_ARG_WITH([ssl], [AC_HELP_STRING([--with-ssl=@<:@LIB@:>@], [SSL library (openssl|polarssl) @<:@default=polarssl@:>@])], [], [with_ssl=polarssl]) 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@:>@ Deafult: /dev/urandom], [enable_polarssl_havege=yes]) # Checks for programs. AC_PROG_CC @@ -48,12 +49,17 @@ AC_CHECK_HEADERS([libconfig.h], [], [AC_MSG_ERROR([could not find libconfig.h])] AC_CHECK_LIB([config], [config_init], [], [AC_MSG_ERROR([could not find libconfig])]) AS_IF([test "x$with_ssl" = xpolarssl], [ AC_CHECK_HEADERS([polarssl/ssl.h], [], [AC_MSG_ERROR([could not find polarssl/ssl.h])]) + AC_CHECK_HEADERS([polarssl/version.h], [], [AC_MSG_ERROR([could not find polarssl/version.h])]) AC_CHECK_LIB([polarssl], [ssl_init], [], [AC_MSG_ERROR([could not find libpolarssl])]) AC_DEFINE([USE_POLARSSL], [], [Use PolarSSL]) AS_IF([test "x$enable_polarssl_test_cert" = xyes], [ AC_CHECK_LIB([polarssl], [test_srv_crt], [], [AC_MSG_ERROR([could not find test_srv_crt])]) AC_DEFINE([USE_POLARSSL_TESTCERT], [], [Use PolarSSL test certificate]) ]) + AS_IF([test "x$enable_polarssl_havege" = xyes], [ + AC_CHECK_LIB([polarssl], [havege_init], [], [AC_MSG_ERROR([could not find havege_init])]) + AC_DEFINE([USE_POLARSSL_HAVEGE], [], [Use PolarSSL HAVEGE random generator]) + ]) ]) AS_IF([test "x$with_ssl" = xopenssl], [ AC_CHECK_HEADERS([openssl/ssl.h], [], [AC_MSG_ERROR([could not find openssl/ssl.h])])