From cdcb8fb9da8efc17b552af5317a5d3f37b63e5ad Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Thu, 26 Aug 2021 17:59:10 -0500
Subject: [PATCH] configure.ac: revert change (AC_MSG_NOTICE reverted to
 AC_MSG_ERROR) for "FIPS source tree used for non-FIPS build"; in enable_all
 set, move enable_stunnel and enable_tcpdump to the !ENABLED_LINUXKM_DEFAULTS
 section.

---
 configure.ac | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/configure.ac b/configure.ac
index 8f7a7b3c1..e6797abe5 100644
--- a/configure.ac
+++ b/configure.ac
@@ -260,7 +260,7 @@ AS_CASE([$FIPS_VERSION],
     [none],
     [
       AS_IF([ test -s $srcdir/wolfcrypt/src/fips.c -o -s $srcdir/ctaocrypt/src/fips.c ],
-            [AC_MSG_NOTICE([FIPS source tree used for non-FIPS build (missing --enable-fips?)])])
+            [AC_MSG_ERROR([FIPS source tree is incompatible with non-FIPS build (requires --enable-fips)])])
     ],
     [v1],
     [
@@ -538,12 +538,12 @@ then
             test "$enable_ed448_stream" = "" && enable_ed448_stream=yes
         fi
 
-# these use DES3:
-        test "$enable_stunnel" = "" && enable_stunnel=yes
-        test "$enable_tcpdump" = "" && enable_tcpdump=yes
-
         if test "$ENABLED_LINUXKM_DEFAULTS" != "yes"
         then
+# these use DES3:
+            test "$enable_stunnel" = "" && enable_stunnel=yes
+            test "$enable_tcpdump" = "" && enable_tcpdump=yes
+
             test "$enable_eccsi" = "" && enable_eccsi=yes
             test "$enable_sakke" = "" && enable_sakke=yes
         fi