X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=configure.ac;h=5b612ca06671235260663a0f4ad67f706b532b3e;hb=38d77b3cbee831144dcfdb2b79c93bc6d494f7fe;hp=d60781fac1c208c1592a386516611a3e04b77c98;hpb=f1c240dd64cb0f7ad9f93b6f8013444b5706e890;p=umurmur.git diff --git a/configure.ac b/configure.ac index d60781f..5b612ca 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.14], [http://code.google.com/p/umurmur/issues/entry], [umurmur], [http://code.google.com/p/umurmur]) +AC_INIT([umurmur], [0.2.15], [http://code.google.com/p/umurmur/issues/entry], [umurmur], [http://code.google.com/p/umurmur]) AC_CONFIG_SRCDIR([src/client.h]) AC_CONFIG_HEADERS([src/config.h]) AM_INIT_AUTOMAKE @@ -38,8 +38,12 @@ AC_CANONICAL_HOST # Configure options. AC_ARG_WITH([ssl], [AC_HELP_STRING([--with-ssl=@<:@LIB@:>@], [SSL library (openssl|polarssl) @<:@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@:>@ Deafult: /dev/urandom], [enable_polarssl_havege=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 @@ -89,6 +93,16 @@ AS_IF([test "x$with_ssl" = xopenssl], [ AM_CONDITIONAL(USE_OPENSSL, test x$with_ssl = xopenssl) AM_CONDITIONAL(USE_GNUTLS, test x$with_ssl = xgnutls) +AS_IF([test "x$enable_shmapi" != xno], + [ + AM_CONDITIONAL(USE_SHAREDMEMORY_API, true) + AC_DEFINE([USE_SHAREDMEMORY_API],[],[Use sharedmemory API]) + ], [ + AM_CONDITIONAL(USE_SHAREDMEMORY_API, false) +]) + + + AC_DEFINE([DEFAULT_CONFIG], ["/etc/umurmur.conf"], [Default config]) # Checks for header files.