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

Simplify handling of --with-ssl-dir. 

ok djm@
This commit is contained in:
Darren Tucker 2022-02-11 20:09:32 +11:00
parent ea13fc830f
commit cd00b48cf1
1 changed files with 9 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
configure.ac
View File

@ -2639,23 +2639,17 @@ AC_ARG_WITH([ssl-dir],
./*|../*) withval="`pwd`/$withval"
esac
if test -d "$withval/lib"; then
if test -n "${rpath_opt}"; then
LDFLAGS="-L${withval}/lib ${rpath_opt}${withval}/lib ${LDFLAGS}"
else
LDFLAGS="-L${withval}/lib ${LDFLAGS}"
fi
libcrypto_path="${withval}/lib"
elif test -d "$withval/lib64"; then
if test -n "${rpath_opt}"; then
LDFLAGS="-L${withval}/lib64 ${rpath_opt}${withval}/lib64 ${LDFLAGS}"
libcrypto_path="$withval/lib64"
else
LDFLAGS="-L${withval}/lib64 ${LDFLAGS}"
# Built but not installed
libcrypto_path="${withval}"
fi
else
if test -n "${rpath_opt}"; then
LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}"
LDFLAGS="-L${libcrypto_path} ${rpath_opt}${libcrypto_path} ${LDFLAGS}"
else
LDFLAGS="-L${withval} ${LDFLAGS}"
fi
LDFLAGS="-L${libcrypto_path} ${LDFLAGS}"
fi
if test -d "$withval/include"; then
CPPFLAGS="-I${withval}/include ${CPPFLAGS}"