aboutsummaryrefslogtreecommitdiffstats
path: root/erts
diff options
context:
space:
mode:
authorIngela Anderton Andin <[email protected]>2017-04-12 16:33:46 +0200
committerIngela Anderton Andin <[email protected]>2017-04-12 16:33:46 +0200
commit4eeaec9bb5dcf94139d3907f2489a44674753153 (patch)
tree9e1760f44b614f15e61f8ef4c93ef81ec6aa84e0 /erts
parent19e9249d960a5b15b4e222efdcb96efbe122853e (diff)
parent6b20e866bab480a8dd23b869ff07d7aed631f1d7 (diff)
downloadotp-4eeaec9bb5dcf94139d3907f2489a44674753153.tar.gz
otp-4eeaec9bb5dcf94139d3907f2489a44674753153.tar.bz2
otp-4eeaec9bb5dcf94139d3907f2489a44674753153.zip
Merge branch 'ingela/openssl-version'
* ingela/openssl-version: crypto: Update documentation to reflect new version policy erts: Update configure check for OpenSSL
Diffstat (limited to 'erts')
-rw-r--r--erts/configure.in4
1 files changed, 2 insertions, 2 deletions
diff --git a/erts/configure.in b/erts/configure.in
index eb3d975edc..b488ba9171 100644
--- a/erts/configure.in
+++ b/erts/configure.in
@@ -4223,7 +4223,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
fi
- AC_MSG_CHECKING(for OpenSSL >= 0.9.7 in standard locations)
+ AC_MSG_CHECKING(for OpenSSL >= 0.9.8c in standard locations)
for rdir in $extra_dir $std_win_ssl_locations $std_ssl_locations; do
dir="$erl_xcomp_sysroot$rdir"
if test -f "$erl_xcomp_isysroot$rdir/include/openssl/opensslv.h"; then
@@ -4299,7 +4299,7 @@ case "$erl_xcomp_without_sysroot-$with_ssl" in
CPPFLAGS=$SSL_INCLUDE
AC_EGREP_CPP(^yes$,[
#include <openssl/opensslv.h>
-#if OPENSSL_VERSION_NUMBER >= 0x0090700fL
+#if OPENSSL_VERSION_NUMBER >= 0x0090803fL
yes
#endif
],[