From: Darren Tucker <dtucker@dtucker.net>
Date: Sat, 7 Jan 2023 03:30:43 +0000 (+1100)
Subject: Use autoconf to find openssl binary.
X-Git-Tag: V_9_2_P1~47
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=26cab41c05d7b0859d2a1ea5b6ed253d91848a80;p=thirdparty%2Fopenssh-portable.git

Use autoconf to find openssl binary.

It's possible to install an OpenSSL in a path not in the system's
default library search path.  OpenSSH can still use this (eg if you
specify an rpath) but the openssl binary there may not work.  If one is
available on the system path just use that.
---

diff --git a/configure.ac b/configure.ac
index f6802500f..6e1de3c75 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2683,6 +2683,7 @@ AC_CHECK_FUNCS([getpgrp],[
 # Search for OpenSSL
 saved_CPPFLAGS="$CPPFLAGS"
 saved_LDFLAGS="$LDFLAGS"
+openssl_bin_PATH="$PATH"
 AC_ARG_WITH([ssl-dir],
 	[  --with-ssl-dir=PATH     Specify path to OpenSSL installation ],
 	[
@@ -2712,14 +2713,11 @@ AC_ARG_WITH([ssl-dir],
 			else
 				CPPFLAGS="-I${withval} ${CPPFLAGS}"
 			fi
-			if test -x "${withval}/bin/openssl"; then
-				openssl_bin="${withval}/bin/openssl"
-			elif test -x "${withval}/apps/openssl"; then
-				openssl_bin="${withval}/apps/openssl"
-			fi
+			openssl_bin_PATH="${PATH}${PATH_SEPARATOR}${withval}/bin${PATH_SEPARATOR}${withval}/apps"
 		fi
 	]
 )
+AC_PATH_PROGS([openssl_bin], openssl, [], [$openssl_bin_PATH])
 AC_SUBST(OPENSSL_BIN, [${openssl_bin}])
 
 AC_ARG_WITH([openssl-header-check],