]> git.ipfire.org Git - thirdparty/openssh-portable.git/commitdiff
Allow --without-ssl-engine with --without-openssl
authorDarren Tucker <dtucker@zip.com.au>
Tue, 15 Dec 2015 04:10:32 +0000 (15:10 +1100)
committerDarren Tucker <dtucker@zip.com.au>
Tue, 15 Dec 2015 04:10:32 +0000 (15:10 +1100)
Patch from Mike Frysinger via github.

configure.ac

index 3ef3c42930a46efbb33f0e548206a8851c29a970..b6854320cdb3ace35335cf65fefc7d52f4dc6edc 100644 (file)
@@ -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
        ]