aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDrake Arconis <drake@alchemyviewer.org>2015-06-14 13:51:06 -0400
committerJay Satiro <raysatiro@yahoo.com>2015-06-14 15:15:36 -0400
commit878c5757c0d97002f3ca623761993b867995c3d3 (patch)
treed1bc4a774f6bd858008c4d2119ef175918012ca1
parentdd39a671019d713bd077be9eed511c2dc6013598 (diff)
build: Properly detect OpenSSL 1.0.2 when using configure
-rw-r--r--m4/curl-openssl.m49
1 files changed, 9 insertions, 0 deletions
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4
index cd9074b02..5980802b7 100644
--- a/m4/curl-openssl.m4
+++ b/m4/curl-openssl.m4
@@ -67,6 +67,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [
esac
case $tst_api in
0x110) tst_show="1.1.0" ;;
+ 0x102) tst_show="1.0.2" ;;
0x101) tst_show="1.0.1" ;;
0x100) tst_show="1.0.0" ;;
0x099) tst_show="0.9.9" ;;
@@ -140,6 +141,13 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
fi
if test "$tst_api" = "unknown"; then
AC_LINK_IFELSE([
+ AC_LANG_FUNC_LINK_TRY([SSL_CONF_CTX_new])
+ ],[
+ tst_api="0x102"
+ ])
+ fi
+ if test "$tst_api" = "unknown"; then
+ AC_LINK_IFELSE([
AC_LANG_FUNC_LINK_TRY([SSL_renegotiate_abbreviated])
],[
tst_api="0x101"
@@ -210,6 +218,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [
fi
case $tst_api in
0x110) tst_show="1.1.0" ;;
+ 0x102) tst_chow="1.0.2" ;;
0x101) tst_show="1.0.1" ;;
0x100) tst_show="1.0.0" ;;
0x099) tst_show="0.9.9" ;;