diff options
| author | Peter Eisentraut | 2022-10-20 19:01:05 +0000 |
|---|---|---|
| committer | Peter Eisentraut | 2022-10-20 19:05:42 +0000 |
| commit | c8e4030d1bddc1120fd1c3f17db5b86a729df4b6 (patch) | |
| tree | 946b80115691fd827a0fc06a7d5c85bfe8a88c1c /configure.ac | |
| parent | 40c7fcbbed5d922e905f8032c5035826d0406980 (diff) | |
Make finding openssl program a configure or meson option
Various test suites use the "openssl" program as part of their setup.
There isn't a way to override which openssl program is to be used,
other than by fiddling with the path, perhaps. This has gotten
increasingly problematic because different versions of openssl have
different capabilities and do different things by default.
This patch checks for an openssl binary in configure and meson setup,
with appropriate ways to override it. This is similar to how "lz4"
and "zstd" are handled, for example. The meson build system actually
already did this, but the result was only used in some places. This
is now applied more uniformly.
Reviewed-by: Michael Paquier <michael@paquier.xyz>
Discussion: https://www.postgresql.org/message-id/flat/dc638b75-a16a-007d-9e1c-d16ed6cf0ad2%40enterprisedb.com
Diffstat (limited to 'configure.ac')
| -rw-r--r-- | configure.ac | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/configure.ac b/configure.ac index d80cdb5ca25..f76b7ee31fc 100644 --- a/configure.ac +++ b/configure.ac @@ -1542,6 +1542,7 @@ if test "$with_gssapi" = yes ; then [AC_CHECK_HEADERS(gssapi.h, [], [AC_MSG_ERROR([gssapi.h header file is required for GSSAPI])])]) fi +PGAC_PATH_PROGS(OPENSSL, openssl) if test "$with_ssl" = openssl ; then AC_CHECK_HEADER(openssl/ssl.h, [], [AC_MSG_ERROR([header file <openssl/ssl.h> is required for OpenSSL])]) AC_CHECK_HEADER(openssl/err.h, [], [AC_MSG_ERROR([header file <openssl/err.h> is required for OpenSSL])]) |