summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@dtucker.net>2024-03-07 17:18:14 +1100
committerDarren Tucker <dtucker@dtucker.net>2024-03-07 19:25:17 +1100
commit9b3f0beb4007a7e01dfedabb429097fb593deae6 (patch)
tree628c2319fb92a93092e768404960272d23bdd2e2
parentc47e1c9c7911f38b2fc2fb01b1f6ae3a3121a838 (diff)
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.
-rw-r--r--configure.ac10
1 files changed, 9 insertions, 1 deletions
diff --git a/configure.ac b/configure.ac
index c1af4b42..82e8bb7c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2743,7 +2743,15 @@ AC_ARG_WITH([ssl-dir],
else
CPPFLAGS="-I${withval} ${CPPFLAGS}"
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
]
)