diff options
| author | Darren Tucker <dtucker@dtucker.net> | 2022-02-11 20:09:32 +1100 |
|---|---|---|
| committer | Darren Tucker <dtucker@dtucker.net> | 2022-02-11 20:09:32 +1100 |
| commit | cd00b48cf10f3565936a418c1e6d7e48b5c36140 (patch) | |
| tree | 0bd94e2c16876c7c24ced211c510b1945a601560 | |
| parent | ea13fc830fc0e0dce2459f1fab2ec5099f73bdf0 (diff) | |
| download | openssh-git-cd00b48cf10f3565936a418c1e6d7e48b5c36140.tar.gz | |
Simplify handling of --with-ssl-dir.
ok djm@
| -rw-r--r-- | configure.ac | 24 |
1 files changed, 9 insertions, 15 deletions
diff --git a/configure.ac b/configure.ac index c10ac8a1..062682be 100644 --- a/configure.ac +++ b/configure.ac @@ -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}" - else - LDFLAGS="-L${withval}/lib64 ${LDFLAGS}" - fi + libcrypto_path="$withval/lib64" else - if test -n "${rpath_opt}"; then - LDFLAGS="-L${withval} ${rpath_opt}${withval} ${LDFLAGS}" - else - LDFLAGS="-L${withval} ${LDFLAGS}" - fi + # Built but not installed + libcrypto_path="${withval}" + fi + if test -n "${rpath_opt}"; then + LDFLAGS="-L${libcrypto_path} ${rpath_opt}${libcrypto_path} ${LDFLAGS}" + else + LDFLAGS="-L${libcrypto_path} ${LDFLAGS}" fi if test -d "$withval/include"; then CPPFLAGS="-I${withval}/include ${CPPFLAGS}" |