diff options
author | Damien Miller <djm@mindrot.org> | 2018-10-26 13:43:28 +1100 |
---|---|---|
committer | Damien Miller <djm@mindrot.org> | 2018-10-26 13:43:28 +1100 |
commit | 406a24b25d6a2bdd70cacd16de7e899dcb2a8829 (patch) | |
tree | 28390a7c41589960400dc9beb41aa77ad3e8db7a /configure.ac | |
parent | 859754bdeb41373d372e36b5dc89c547453addb3 (diff) |
fix builds on OpenSSL <= 1.0.x
I thought OpenSSL 1.0.x offered the new-style OpenSSL_version_num() API
to obtain version number, but they don't.
Diffstat (limited to 'configure.ac')
-rw-r--r-- | configure.ac | 9 |
1 files changed, 8 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac index 0d55bece5..a4109effc 100644 --- a/configure.ac +++ b/configure.ac | |||
@@ -2601,7 +2601,11 @@ if test "x$openssl" = "xyes" ; then | |||
2601 | fd = fopen(DATA,"w"); | 2601 | fd = fopen(DATA,"w"); |
2602 | if(fd == NULL) | 2602 | if(fd == NULL) |
2603 | exit(1); | 2603 | exit(1); |
2604 | 2604 | #if OPENSSL_VERSION_NUMBER < 0x10100000L | |
2605 | # define OpenSSL_version_num SSLeay | ||
2606 | # define OpenSSL_version SSLeay_version | ||
2607 | # define OPENSSL_VERSION SSLEAY_VERSION | ||
2608 | #endif | ||
2605 | if ((rc = fprintf(fd, "%08lx (%s)\n", | 2609 | if ((rc = fprintf(fd, "%08lx (%s)\n", |
2606 | (unsigned long)OpenSSL_version_num(), | 2610 | (unsigned long)OpenSSL_version_num(), |
2607 | OpenSSL_version(OPENSSL_VERSION))) < 0) | 2611 | OpenSSL_version(OPENSSL_VERSION))) < 0) |
@@ -2646,6 +2650,9 @@ if test "x$openssl" = "xyes" ; then | |||
2646 | #include <openssl/opensslv.h> | 2650 | #include <openssl/opensslv.h> |
2647 | #include <openssl/crypto.h> | 2651 | #include <openssl/crypto.h> |
2648 | ]], [[ | 2652 | ]], [[ |
2653 | #if OPENSSL_VERSION_NUMBER < 0x10100000L | ||
2654 | # define OpenSSL_version_num SSLeay | ||
2655 | #endif | ||
2649 | exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1); | 2656 | exit(OpenSSL_version_num() == OPENSSL_VERSION_NUMBER ? 0 : 1); |
2650 | ]])], | 2657 | ]])], |
2651 | [ | 2658 | [ |