X-Git-Url: http://git.code-monkey.de/?a=blobdiff_plain;f=configure.ac;h=a5173bc28138a2d05621597aa1d3ddfb3e4aac1a;hb=23a4fcd5944b793bba2cc4cc70c87cd68c3c051c;hp=75a12d262f1999c594c488e7aaa2c0d03fda8a02;hpb=c989e4519ccdb068d0897e6255b9f3306e385bac;p=umurmur.git

diff --git a/configure.ac b/configure.ac
index 75a12d2..a5173bc 100644
--- a/configure.ac
+++ b/configure.ac
@@ -28,14 +28,14 @@
 #  SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
 
 # Process this file with autoconf to produce a configure script.
-AC_PREREQ([2.67])
-AC_INIT([umurmur], [0.2.6], [http://code.google.com/p/umurmur/issues/entry], [umurmur], [http://code.google.com/p/umurmur])
+AC_PREREQ([2.63])
+AC_INIT([umurmur], [0.2.7], [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
 
 # Configure options.
-AC_ARG_WITH([openssl], [AC_HELP_STRING([--with-openssl], [force use of openssl])], [], [with_openssl=no])
+AC_ARG_WITH([ssl], [AC_HELP_STRING([--with-ssl=@<:@LIB@:>@], [SSL library (openssl|polarssl) @<:@default=polarssl@:>@])], [], [with_ssl=polarssl])
 
 # Checks for programs.
 AC_PROG_CC
@@ -44,14 +44,17 @@ AC_PROG_CC
 AC_CHECK_HEADERS([google/protobuf-c/protobuf-c.h], [], [AC_MSG_ERROR([could not find google/protobuf-c/protobuf-c.h])])
 AC_CHECK_LIB([protobuf-c], [protobuf_c_data_buffer_init], [], [AC_MSG_ERROR([could not find protobuf-c library])])
 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 config])])
-AS_IF([test "x$with_openssl" == xno], [
-	AC_CHECK_HEADERS([polarssl/ssl.h])
-	AC_CHECK_LIB([polarssl], [ssl_init])	
+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_LIB([polarssl], [ssl_init], [], [AC_MSG_ERROR([could not find libpolarssl])])
+	AC_DEFINE([USE_POLARSSL], [], [Use PolarSSL])
+])
+AS_IF([test "x$with_ssl" == xopenssl], [
+	AC_CHECK_HEADERS([openssl/ssl.h], [], [AC_MSG_ERROR([could not find openssl/ssl.h])])
+	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])])
 ])
-AC_CHECK_HEADERS([openssl/ssl.h])
-AC_CHECK_LIB([ssl], [SSL_library_init])
-AC_CHECK_LIB([crypto], [BN_init])
 
 # Checks for header files.
 AC_FUNC_ALLOCA
@@ -74,18 +77,5 @@ AC_FUNC_FORK
 #AC_FUNC_MALLOC
 AC_CHECK_FUNCS([ftruncate gettimeofday inet_ntoa memchr memmove memset socket strdup strerror strrchr uname], [], [AC_MSG_ERROR([missing a required func])])
 
-# Choose PolarSSL as default if present, fallback on OpenSSL if not or if --with-openssl was specified.
-AS_IF([test "x$with_openssl" == xno -a "x$ac_cv_lib_polarssl_ssl_init" == xyes -a "x$ac_cv_header_polarssl_ssl_h" == xyes],
-	[
-		AC_DEFINE([USE_POLARSSL], [], [Use PolarSSL])
-		AC_MSG_NOTICE([Using PolarSSL as SSL library])
-	],
-	[AS_IF([test "x$ac_cv_lib_ssl_SSL_library_init" != xyes -o "x$ac_cv_lib_crypto_BN_init" != xyes -o "x$ac_cv_header_openssl_ssl_h" != xyes],
-		[AS_IF([test "x$with_openssl" != xno],
-			[AC_MSG_ERROR([OpenSSL not found])],
-			[AC_MSG_ERROR([could not find any ssl library])])],
-		[AC_MSG_NOTICE([Using OpenSSL as SSL library])])]
-)
-
 AC_CONFIG_FILES([Makefile src/Makefile])
 AC_OUTPUT