diff options
| author | Daniel Stenberg <daniel@haxx.se> | 2021-07-26 21:51:11 +0200 |
|---|---|---|
| committer | Daniel Stenberg <daniel@haxx.se> | 2021-07-26 23:46:30 +0200 |
| commit | 1e5e93d899eece446afbf2c40adbdbc86f0e9550 (patch) | |
| tree | 63018fddddc60336856ec0f93d83ced8a5461c9b /m4/curl-openssl.m4 | |
| parent | 76bed59ec3577ee40e568a30a053903cce05e7df (diff) | |
| download | curl-1e5e93d899eece446afbf2c40adbdbc86f0e9550.tar.gz | |
curl-openssl.m4: check lib64 for the pkg-config file
OpenSSL recently started putting the libs in $prefix/lib64 on 'make
install', so we check that directory for pkg-config data if the 'lib'
check fails.
Closes #7503
Diffstat (limited to 'm4/curl-openssl.m4')
| -rw-r--r-- | m4/curl-openssl.m4 | 17 |
1 files changed, 15 insertions, 2 deletions
diff --git a/m4/curl-openssl.m4 b/m4/curl-openssl.m4 index 835768e1b..693114eca 100644 --- a/m4/curl-openssl.m4 +++ b/m4/curl-openssl.m4 @@ -330,8 +330,21 @@ if test "x$OPT_OPENSSL" != xno; then if test -f "$OPENSSL_PCDIR/openssl.pc"; then AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"]) PKGTEST="yes" - elif test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then - AC_MSG_ERROR([$PREFIX_OPENSSL is a bad --with-openssl prefix!]) + fi + + if test "$PKGTEST" != "yes"; then + # try lib64 instead + OPENSSL_PCDIR="$OPT_OPENSSL/lib64/pkgconfig" + if test -f "$OPENSSL_PCDIR/openssl.pc"; then + AC_MSG_NOTICE([PKG_CONFIG_LIBDIR will be set to "$OPENSSL_PCDIR"]) + PKGTEST="yes" + fi + fi + + if test "$PKGTEST" != "yes"; then + if test ! -f "$PREFIX_OPENSSL/include/openssl/ssl.h"; then + AC_MSG_ERROR([$PREFIX_OPENSSL is a bad --with-openssl prefix!]) + fi fi dnl in case pkg-config comes up empty, use what we got |