From 515feb9885c193255121342540eac07f77b4b580 Mon Sep 17 00:00:00 2001 From: Niels de Vos Date: Tue, 9 Jun 2015 16:32:37 +0200 Subject: build: improve detection of new OpenSSL features Building on Mac OS X revealed that the current check for CRYPTO_THREADID_set_callback() availability in OpenSSL is not correct. There also does not seem to be a guarantee that TLSv1_2_method() is available when TLS1_2_VERSION is #define'd. Change-Id: I21508065fc181a1c74bee4fd6d23bb5bdf7cea7a BUG: 1222317 Original-author: Kaleb KEITHLEY Signed-off-by: Niels de Vos Reviewed-on: http://review.gluster.org/11140 Reviewed-by: Kaleb KEITHLEY Tested-by: Gluster Build System Reviewed-by: Raghavendra G Tested-by: Raghavendra G --- configure.ac | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'configure.ac') diff --git a/configure.ac b/configure.ac index fad2874c70a..9a0cb7ba91d 100644 --- a/configure.ac +++ b/configure.ac @@ -534,8 +534,9 @@ fi AM_CONDITIONAL([ENABLE_BD_XLATOR], [test x$BUILD_BD_XLATOR = xyes]) dnl check for old openssl -AC_CHECK_FUNC([ssl], [CRYPTO_THREADID_set_callback], [HAVE_CRYPTO_THREADID=1], HAVE_CRYPTO_THREADID=0) -AC_DEFINE(HAVE_CRYPTO_THREADID, $HAVE_CRYPTO_THREADID, [use new OpenSSL functions]) +AC_CHECK_LIB([crypto], CRYPTO_THREADID_set_callback, [AC_DEFINE([HAVE_CRYPTO_THREADID], [1], [use new OpenSSL functions])]) + +AC_CHECK_LIB([ssl], TLSv1_2_method, [AC_DEFINE([HAVE_TLSV1_2_METHOD], [1], [use new OpenSSL functions])]) # start encryption/crypt section -- cgit