mirror of git://anongit.mindrot.org/openssh.git
Prefer openssl binary from --with-ssl-dir directory.
Use openssl in the directory specified by --with-ssl-dir as long as it's functional. Reported by The Doctor.
This commit is contained in:
parent
c47e1c9c79
commit
9b3f0beb40
10
configure.ac
10
configure.ac
|
@ -2743,7 +2743,15 @@ AC_ARG_WITH([ssl-dir],
|
||||||
else
|
else
|
||||||
CPPFLAGS="-I${withval} ${CPPFLAGS}"
|
CPPFLAGS="-I${withval} ${CPPFLAGS}"
|
||||||
fi
|
fi
|
||||||
openssl_bin_PATH="${PATH}${PATH_SEPARATOR}${withval}/bin${PATH_SEPARATOR}${withval}/apps"
|
dnl Ensure specified openssl binary works, eg it can
|
||||||
|
dnl find its runtime libraries, before trying to use.
|
||||||
|
if test -x "${withval}/bin/openssl" && \
|
||||||
|
"${withval}/bin/openssl" version >/dev/null 2>&1; then
|
||||||
|
openssl_bin_PATH="${withval}/bin${PATH_SEPARATOR}${PATH}"
|
||||||
|
elif test -x "${withval}/apps/openssl" && \
|
||||||
|
"${withval}/apps/openssl" version >/dev/null 2>&1; then
|
||||||
|
openssl_bin_PATH="${withval}/apps${PATH_SEPARATOR}${PATH}"
|
||||||
|
fi
|
||||||
fi
|
fi
|
||||||
]
|
]
|
||||||
)
|
)
|
||||||
|
|
Loading…
Reference in New Issue