mirror of
https://github.com/postgres/postgres.git
synced 2025-07-27 12:41:57 +03:00
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
This commit is contained in:
55
configure
vendored
55
configure
vendored
@ -648,6 +648,7 @@ PG_CRC32C_OBJS
|
||||
CFLAGS_ARMV8_CRC32C
|
||||
CFLAGS_SSE42
|
||||
LIBOBJS
|
||||
OPENSSL
|
||||
ZSTD
|
||||
LZ4
|
||||
UUID_LIBS
|
||||
@ -14112,6 +14113,60 @@ done
|
||||
|
||||
fi
|
||||
|
||||
if test -z "$OPENSSL"; then
|
||||
for ac_prog in openssl
|
||||
do
|
||||
# Extract the first word of "$ac_prog", so it can be a program name with args.
|
||||
set dummy $ac_prog; ac_word=$2
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
|
||||
$as_echo_n "checking for $ac_word... " >&6; }
|
||||
if ${ac_cv_path_OPENSSL+:} false; then :
|
||||
$as_echo_n "(cached) " >&6
|
||||
else
|
||||
case $OPENSSL in
|
||||
[\\/]* | ?:[\\/]*)
|
||||
ac_cv_path_OPENSSL="$OPENSSL" # Let the user override the test with a path.
|
||||
;;
|
||||
*)
|
||||
as_save_IFS=$IFS; IFS=$PATH_SEPARATOR
|
||||
for as_dir in $PATH
|
||||
do
|
||||
IFS=$as_save_IFS
|
||||
test -z "$as_dir" && as_dir=.
|
||||
for ac_exec_ext in '' $ac_executable_extensions; do
|
||||
if as_fn_executable_p "$as_dir/$ac_word$ac_exec_ext"; then
|
||||
ac_cv_path_OPENSSL="$as_dir/$ac_word$ac_exec_ext"
|
||||
$as_echo "$as_me:${as_lineno-$LINENO}: found $as_dir/$ac_word$ac_exec_ext" >&5
|
||||
break 2
|
||||
fi
|
||||
done
|
||||
done
|
||||
IFS=$as_save_IFS
|
||||
|
||||
;;
|
||||
esac
|
||||
fi
|
||||
OPENSSL=$ac_cv_path_OPENSSL
|
||||
if test -n "$OPENSSL"; then
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
|
||||
$as_echo "$OPENSSL" >&6; }
|
||||
else
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: no" >&5
|
||||
$as_echo "no" >&6; }
|
||||
fi
|
||||
|
||||
|
||||
test -n "$OPENSSL" && break
|
||||
done
|
||||
|
||||
else
|
||||
# Report the value of OPENSSL in configure's output in all cases.
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: checking for OPENSSL" >&5
|
||||
$as_echo_n "checking for OPENSSL... " >&6; }
|
||||
{ $as_echo "$as_me:${as_lineno-$LINENO}: result: $OPENSSL" >&5
|
||||
$as_echo "$OPENSSL" >&6; }
|
||||
fi
|
||||
|
||||
if test "$with_ssl" = openssl ; then
|
||||
ac_fn_c_check_header_mongrel "$LINENO" "openssl/ssl.h" "ac_cv_header_openssl_ssl_h" "$ac_includes_default"
|
||||
if test "x$ac_cv_header_openssl_ssl_h" = xyes; then :
|
||||
|
Reference in New Issue
Block a user