From: Darren Tucker <dtucker@zip.com.au>
Date: Tue, 15 Dec 2015 04:10:32 +0000 (+1100)
Subject: Allow --without-ssl-engine with --without-openssl
X-Git-Tag: V_7_2_P1~71
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=b5fa0cd73555b991a543145603658d7088ec6b60;p=thirdparty%2Fopenssh-portable.git

Allow --without-ssl-engine with --without-openssl

Patch from Mike Frysinger via github.
---

diff --git a/configure.ac b/configure.ac
index 3ef3c4293..b6854320c 100644
--- a/configure.ac
+++ b/configure.ac
@@ -2309,10 +2309,10 @@ openssl_engine=no
 AC_ARG_WITH([ssl-engine],
 	[  --with-ssl-engine       Enable OpenSSL (hardware) ENGINE support ],
 	[
-		if test "x$openssl" = "xno" ; then
-			AC_MSG_ERROR([cannot use --with-ssl-engine when OpenSSL disabled])
-		fi
 		if test "x$withval" != "xno" ; then
+			if test "x$openssl" = "xno" ; then
+				AC_MSG_ERROR([cannot use --with-ssl-engine when OpenSSL disabled])
+			fi
 			openssl_engine=yes
 		fi
 	]