From: Darren Tucker <dtucker@dtucker.net>
Date: Thu, 7 Mar 2024 06:18:14 +0000 (+1100)
Subject: Prefer openssl binary from --with-ssl-dir directory.
X-Git-Tag: V_9_7_P1~8
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=9b3f0beb4007a7e01dfedabb429097fb593deae6;p=thirdparty%2Fopenssh-portable.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.
---

diff --git a/configure.ac b/configure.ac
index c1af4b423..82e8bb7c1 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
 	]
 )