Use autoconf to find openssl binary.

It's possible to install an OpenSSL in a path not in the system's
default library search path.  OpenSSH can still use this (eg if you
specify an rpath) but the openssl binary there may not work.  If one is
available on the system path just use that.
This commit is contained in:
Darren Tucker 2023-01-07 14:30:43 +11:00
parent 5532e010a0
commit 26cab41c05
No known key found for this signature in database
1 changed files with 3 additions and 5 deletions

View File

@ -2683,6 +2683,7 @@ AC_CHECK_FUNCS([getpgrp],[
# Search for OpenSSL
saved_CPPFLAGS="$CPPFLAGS"
saved_LDFLAGS="$LDFLAGS"
openssl_bin_PATH="$PATH"
AC_ARG_WITH([ssl-dir],
[ --with-ssl-dir=PATH Specify path to OpenSSL installation ],
[
@ -2712,14 +2713,11 @@ AC_ARG_WITH([ssl-dir],
else
CPPFLAGS="-I${withval} ${CPPFLAGS}"
fi
if test -x "${withval}/bin/openssl"; then
openssl_bin="${withval}/bin/openssl"
elif test -x "${withval}/apps/openssl"; then
openssl_bin="${withval}/apps/openssl"
fi
openssl_bin_PATH="${PATH}${PATH_SEPARATOR}${withval}/bin${PATH_SEPARATOR}${withval}/apps"
fi
]
)
AC_PATH_PROGS([openssl_bin], openssl, [], [$openssl_bin_PATH])
AC_SUBST(OPENSSL_BIN, [${openssl_bin}])
AC_ARG_WITH([openssl-header-check],