diff options
| author | Nick Mathewson <nickm@torproject.org> | 2015-09-01 10:42:47 -0400 |
|---|---|---|
| committer | Nick Mathewson <nickm@torproject.org> | 2015-09-01 10:42:47 -0400 |
| commit | 0e60c52c6cf1863866a37dcb694823b21898eaf3 (patch) | |
| tree | e318b4bbfb5f082173dae3e3738b1dc96258e7e9 | |
| parent | d891e2a9c517e2b097456b7143f955ac66b112ea (diff) | |
| parent | b79e90f6ba9426158cf305655590f70d3ae89875 (diff) | |
| download | tor-0e60c52c6cf1863866a37dcb694823b21898eaf3.tar.gz tor-0e60c52c6cf1863866a37dcb694823b21898eaf3.zip | |
Merge branch 'ticket16901'
| -rw-r--r-- | changes/bug16901 | 3 | ||||
| -rw-r--r-- | configure.ac | 10 |
2 files changed, 13 insertions, 0 deletions
diff --git a/changes/bug16901 b/changes/bug16901 new file mode 100644 index 0000000000..c008ebdbd8 --- /dev/null +++ b/changes/bug16901 @@ -0,0 +1,3 @@ + o Minor features (compilation): + - Give a warning as early as possible when trying to build with an + unsupported OpenSSL version. Closes ticket 16901. diff --git a/configure.ac b/configure.ac index 3bb70ed88f..984a7084b3 100644 --- a/configure.ac +++ b/configure.ac @@ -632,6 +632,16 @@ save_CPPFLAGS="$CPPFLAGS" LIBS="$TOR_OPENSSL_LIBS $LIBS" LDFLAGS="$TOR_LDFLAGS_openssl $LDFLAGS" CPPFLAGS="$TOR_CPPFLAGS_openssl $CPPFLAGS" + +AC_TRY_COMPILE([ +#include <openssl/opensslv.h> +#if OPENSSL_VERSION_NUMBER < 0x1000000fL +#error "too old" +#endif + ], [], + [ ], + [ AC_ERROR([OpenSSL is too old. We require 1.0.0 or later. You can specify a path to a newer one with --with-openssl-dir.]) ]) + AC_CHECK_MEMBERS([struct ssl_method_st.get_cipher_by_char], , , [#include <openssl/ssl.h> ]) |