diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-06-02 13:45:27 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-06-02 13:45:27 -0400 |
| commit | 0030765e04d8dfe3dfaf8124b01a4d578b7d8ceb (patch) | |
| tree | e74d715553f1798a0eea21a96e2a83b8230d6167 /configure.ac | |
| parent | 3d653dff5e891c1e547ef7eacbc991410a98c1cb (diff) | |
| parent | ff835e23280c0f29ca9ab25bfc3069276c0b8ab6 (diff) | |
| download | tor-0030765e04d8dfe3dfaf8124b01a4d578b7d8ceb.tar.gz tor-0030765e04d8dfe3dfaf8124b01a4d578b7d8ceb.zip | |
Merge remote-tracking branch 'public/bug15760_hard_026_v2'
Conflicts:
src/common/tortls.c
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 18 |
1 files changed, 18 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index 952fc9fb01..865db2fc92 100644 --- a/configure.ac +++ b/configure.ac @@ -610,10 +610,28 @@ else fi AC_SUBST(TOR_OPENSSL_LIBS) +dnl Now check for particular openssl functions. +save_LIBS="$LIBS" +save_LDFLAGS="$LDFLAGS" +save_CPPFLAGS="$CPPFLAGS" +LIBS="$TOR_OPENSSL_LIBS $LIBS" +LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS" +CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS" AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , , [#include <openssl/ssl.h> ]) +AC_CHECK_FUNCS([ \ + SSL_SESSION_get_master_key \ + SSL_get_server_random \ + SSL_get_client_ciphers \ + SSL_get_client_random \ + SSL_CIPHER_find \ + ]) +LIBS="$save_LIBS" +LDFLAGS="$save_LDFLAGS" +CPPFLAGS="$save_CPPFLAGS" + dnl ------------------------------------------------------ dnl Where do you live, zlib? And how do we call you? |