diff options
| -rw-r--r-- | config.h.in | 3 | ||||
| -rwxr-xr-x | configure | 25 | ||||
| -rw-r--r-- | configure.in | 15 |
3 files changed, 39 insertions, 4 deletions
diff --git a/config.h.in b/config.h.in index 914289a8..882f4223 100644 --- a/config.h.in +++ b/config.h.in @@ -85,6 +85,9 @@ /* Define to 1 if you have the `openat' function. */ #undef HAVE_OPENAT +/* Define to 1 if you have the <openssl/crypto.h> header file. */ +#undef HAVE_OPENSSL_CRYPTO_H + /* Define to 1 if you have the <openssl/evp.h> header file. */ #undef HAVE_OPENSSL_EVP_H @@ -8161,7 +8161,23 @@ $as_echo "yes, if available" >&6; } fi if test "$want_libcrypto" != "no"; then - { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DES_cbc_encrypt in -lcrypto" >&5 + # + # If we don't have the header, no point in checking the + # library. + # + # Yes, there are OSes that provide the library but not + # the header. (I'm looking at *you*, recent versions of + # OS X/macOS.) + # + for ac_header in openssl/crypto.h +do : + ac_fn_c_check_header_mongrel "$LINENO" "openssl/crypto.h" "ac_cv_header_openssl_crypto_h" "$ac_includes_default" +if test "x$ac_cv_header_openssl_crypto_h" = xyes; then : + cat >>confdefs.h <<_ACEOF +#define HAVE_OPENSSL_CRYPTO_H 1 +_ACEOF + + { $as_echo "$as_me:${as_lineno-$LINENO}: checking for DES_cbc_encrypt in -lcrypto" >&5 $as_echo_n "checking for DES_cbc_encrypt in -lcrypto... " >&6; } if ${ac_cv_lib_crypto_DES_cbc_encrypt+:} false; then : $as_echo_n "(cached) " >&6 @@ -8206,7 +8222,7 @@ _ACEOF fi - for ac_header in openssl/evp.h + for ac_header in openssl/evp.h do : ac_fn_c_check_header_mongrel "$LINENO" "openssl/evp.h" "ac_cv_header_openssl_evp_h" "$ac_includes_default" if test "x$ac_cv_header_openssl_evp_h" = xyes; then : @@ -8218,6 +8234,11 @@ fi done + +fi + +done + fi # Check for libcap-ng diff --git a/configure.in b/configure.in index a629559e..abb4c0eb 100644 --- a/configure.in +++ b/configure.in @@ -1112,8 +1112,19 @@ AC_ARG_WITH(crypto, AC_MSG_RESULT([yes, if available]) ]) if test "$want_libcrypto" != "no"; then - AC_CHECK_LIB(crypto, DES_cbc_encrypt) - AC_CHECK_HEADERS(openssl/evp.h) + # + # If we don't have the header, no point in checking the + # library. + # + # Yes, there are OSes that provide the library but not + # the header. (I'm looking at *you*, recent versions of + # OS X/macOS.) + # + AC_CHECK_HEADERS(openssl/crypto.h, + [ + AC_CHECK_LIB(crypto, DES_cbc_encrypt) + AC_CHECK_HEADERS(openssl/evp.h) + ]) fi # Check for libcap-ng |