tyler.durden
/
openssh-portable
mirror of https://github.com/PowerShell/openssh-portable.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Set OPENSSL_BIN from OpenSSL directory.

This commit is contained in:
Darren Tucker 2023-01-06 23:19:07 +11:00
parent 344a0e8240
commit 5d7b16cff4
No known key found for this signature in database
2 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Makefile.in
View File

@ -723,6 +723,7 @@ unit: regress-unit-binaries
interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS) interop-tests t-exec file-tests: regress-prep regress-binaries $(TARGETS)
cd $(srcdir)/regress || exit $$?; \ cd $(srcdir)/regress || exit $$?; \
EGREP='@EGREP@' \ EGREP='@EGREP@' \
OPENSSL_BIN='@OPENSSL_BIN@' \
$(MAKE) \ $(MAKE) \
.CURDIR="$(abs_top_srcdir)/regress" \ .CURDIR="$(abs_top_srcdir)/regress" \
.OBJDIR="$(BUILDDIR)/regress" \ .OBJDIR="$(BUILDDIR)/regress" \

6
configure.ac
View File

@ -130,10 +130,12 @@ AC_CHECK_DECL([PR_SET_NO_NEW_PRIVS], [have_linux_no_new_privs=1], , [
]) ])
openssl=yes openssl=yes
openssl_bin=openssl
AC_ARG_WITH([openssl], AC_ARG_WITH([openssl],
[ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ], [ --without-openssl Disable use of OpenSSL; use only limited internal crypto **EXPERIMENTAL** ],
[ if test "x$withval" = "xno" ; then [ if test "x$withval" = "xno" ; then
openssl=no openssl=no
openssl_bin=""
fi fi
] ]
) )
@ -2694,11 +2696,14 @@ AC_ARG_WITH([ssl-dir],
esac esac
if test -d "$withval/lib"; then if test -d "$withval/lib"; then
libcrypto_path="${withval}/lib" libcrypto_path="${withval}/lib"
openssl_bin="${withval}/bin/openssl"
elif test -d "$withval/lib64"; then elif test -d "$withval/lib64"; then
libcrypto_path="$withval/lib64" libcrypto_path="$withval/lib64"
openssl_bin="${withval}/bin/openssl"
else else
# Built but not installed # Built but not installed
libcrypto_path="${withval}" libcrypto_path="${withval}"
openssl_bin="${withval}/apps/openssl"
fi fi
if test -n "${rpath_opt}"; then if test -n "${rpath_opt}"; then
LDFLAGS="-L${libcrypto_path} ${rpath_opt}${libcrypto_path} ${LDFLAGS}" LDFLAGS="-L${libcrypto_path} ${rpath_opt}${libcrypto_path} ${LDFLAGS}"
@ -2713,6 +2718,7 @@ AC_ARG_WITH([ssl-dir],
fi fi
] ]
) )
AC_SUBST(OPENSSL_BIN, [${openssl_bin}])
AC_ARG_WITH([openssl-header-check], AC_ARG_WITH([openssl-header-check],
[ --without-openssl-header-check Disable OpenSSL version consistency check], [ --without-openssl-header-check Disable OpenSSL version consistency check],