aboutsummaryrefslogtreecommitdiff
path: root/configure.ac
diff options
context:
space:
mode:
authorNick Mathewson <nickm@torproject.org>2017-09-26 13:02:26 -0400
committerNick Mathewson <nickm@torproject.org>2017-09-26 13:02:26 -0400
commit2de588ffdbb3502ad680283ef5363125a1966de2 (patch)
tree42f096197b46805293a1100d2701e966a9ec6b9c /configure.ac
parent6beeb10070190b8caf5af379476f725c38fbd663 (diff)
parent564ff506ea34ef44422470ed4dc2856e0c234c87 (diff)
downloadtor-2de588ffdbb3502ad680283ef5363125a1966de2.tar.gz
tor-2de588ffdbb3502ad680283ef5363125a1966de2.zip
Merge branch 'ticket23602_029'
Diffstat (limited to 'configure.ac')
-rw-r--r--configure.ac9
1 files changed, 5 insertions, 4 deletions
diff --git a/configure.ac b/configure.ac
index ded79dbc8f..d2682944fb 100644
--- a/configure.ac
+++ b/configure.ac
@@ -722,11 +722,12 @@ AC_ARG_WITH(ssl-dir,
fi
])
+AC_MSG_NOTICE([Now, we'll look for OpenSSL >= 1.0.1])
TOR_SEARCH_LIBRARY(openssl, $tryssldir, [-lssl -lcrypto $TOR_LIB_GDI],
- [#include <openssl/rand.h>],
- [void RAND_add(const void *buf, int num, double entropy);],
- [RAND_add((void*)0,0,0);], [],
- [/usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
+ [#include <openssl/ssl.h>],
+ [struct ssl_method_st; const struct ssl_method_st *TLSv1_1_method(void);],
+ [TLSv1_1_method();], [],
+ [/usr/local/opt/openssl /usr/local/openssl /usr/lib/openssl /usr/local/ssl /usr/lib/ssl /usr/local /usr/athena /opt/openssl])
dnl XXXX check for OPENSSL_VERSION_NUMBER == SSLeay()