diff options
Diffstat (limited to 'm4/curl-openssl.m4')
-rw-r--r-- | m4/curl-openssl.m4 | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index 20c31265..d5582786 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" ;; @@ -102,7 +103,7 @@ dnl Find out OpenSSL library API version, performing dnl only link tests in order to avoid getting fooled dnl by mismatched OpenSSL headers. No runtime checks dnl allowed here for cross-compilation support. -dnl HAVE_OPENSSL_API_LIBRARY is defined as apprpriate +dnl HAVE_OPENSSL_API_LIBRARY 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. @@ -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" ;; |