diff options
| author | Jay Satiro <raysatiro@yahoo.com> | 2018-02-24 03:18:15 -0500 |
|---|---|---|
| committer | Jay Satiro <raysatiro@yahoo.com> | 2018-02-24 03:18:15 -0500 |
| commit | 1b27fcfcf7424bbb866f6398b0c6070f82b6f73d (patch) | |
| tree | d13279e25f18a97085d4539e22702c4f4f804ee3 /m4 | |
| parent | a1d78ffc8d568c85d1088e05c585dc211f7ca05b (diff) | |
| download | curl-1b27fcfcf7424bbb866f6398b0c6070f82b6f73d.tar.gz | |
curl-openssl.m4: Fix version check for OpenSSL 1.1.1
- Add OpenSSL 1.1.1 to the header/library version lists.
- Detect OpenSSL 1.1.1 library using its function ERR_clear_last_mark,
which was added in that version.
Prior to this change an erroneous header/library mismatch was caused by
lack of OpenSSL 1.1.1 detection. I tested using openssl-1.1.1-pre1.
Diffstat (limited to 'm4')
| -rw-r--r-- | m4/curl-openssl.m4 | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index 20c312658..391099b69 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -29,7 +29,7 @@ dnl ------------------------------------------------- dnl Find out OpenSSL headers API version, as reported dnl by OPENSSL_VERSION_NUMBER. No runtime checks dnl allowed here for cross-compilation support. -dnl HAVE_OPENSSL_API_HEADERS is defined as apprpriate +dnl HAVE_OPENSSL_API_HEADERS is defined as appropriate dnl only for systems which actually run the configure dnl script. Config files generated manually or in any dnl other way shall not define this. @@ -66,6 +66,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_HEADERS], [ ;; esac case $tst_api in + 0x111) tst_show="1.1.1" ;; 0x110) tst_show="1.1.0" ;; 0x102) tst_show="1.0.2" ;; 0x101) tst_show="1.0.1" ;; @@ -122,6 +123,13 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [ # AC_MSG_CHECKING([for OpenSSL library version]) if test "$tst_api" = "unknown"; then + AC_LINK_IFELSE([ + AC_LANG_FUNC_LINK_TRY([ERR_clear_last_mark]) + ],[ + tst_api="0x111" + ]) + fi + if test "$tst_api" = "unknown"; then case $host in *-*-vms*) AC_LINK_IFELSE([ @@ -217,6 +225,7 @@ AC_DEFUN([CURL_CHECK_OPENSSL_API_LIBRARY], [ ]) fi case $tst_api in + 0x111) tst_show="1.1.1" ;; 0x110) tst_show="1.1.0" ;; 0x102) tst_show="1.0.2" ;; 0x101) tst_show="1.0.1" ;; |