diff options
| author | Matthew Sheby <sheby+github@abtech.org> | 2020-03-31 00:43:41 -0700 |
|---|---|---|
| committer | Matthew Sheby <sheby+github@abtech.org> | 2020-03-31 00:43:41 -0700 |
| commit | 99ee661e7785bd14b7634f389f6bbdc4a67f2c6b (patch) | |
| tree | 0df392958b811b253c7a8f8d649a3792c0cf3318 | |
| parent | 7b70b206a3bd767aad3a9a3c789cff9d0e9c38f2 (diff) | |
update pipeline to handle formatting change in OpenSSL header file
| -rw-r--r-- | m4/ax_lib_openssl.m4 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/m4/ax_lib_openssl.m4 b/m4/ax_lib_openssl.m4 index 8a70f99..a7f69f0 100644 --- a/m4/ax_lib_openssl.m4 +++ b/m4/ax_lib_openssl.m4 @@ -237,7 +237,7 @@ SSLeay(); if test -f "$openssl_include_dir/openssl/opensslv.h"; then OPENSSL_VERSION=`grep OPENSSL_VERSION_TEXT $openssl_include_dir/openssl/opensslv.h \ - | grep -v fips | grep -v PTEXT | cut -f 2 | tr -d \"` + | grep -v fips | grep -v PTEXT | sed -e 's/[ ][ ][ ]*/\t/g' | cut -f 2 | tr -d \"` AC_SUBST([OPENSSL_VERSION]) dnl Decompose required version string and calculate numerical representation @@ -259,7 +259,7 @@ SSLeay(); \+ $((0xf))` dnl Calculate numerical representation of detected version - openssl_version_number=`expr $(($(grep OPENSSL_VERSION_NUMBER $openssl_include_dir/openssl/opensslv.h | cut -f 2 | tr -d L)))` + openssl_version_number=`expr $(($(grep OPENSSL_VERSION_NUMBER $openssl_include_dir/openssl/opensslv.h | sed -e 's/[ ][ ][ ]*/\t/g' | cut -f 2 | tr -d L)))` openssl_version_check=`expr $openssl_version_number \>\= $openssl_version_req_number` if test "$openssl_version_check" = "1"; then |