From 7d177e78d7a8600c0137a10d1b85d7220931360e Mon Sep 17 00:00:00 2001
From: Daniel Pouzzner <douzzer@wolfssl.com>
Date: Wed, 28 Oct 2020 17:17:06 -0500
Subject: [PATCH] don't include wolfssl/options.h in logging.c, use AM_CFLAGS
 (not wolfssl/options.h) to communicate HAVE_WC_INTROSPECTION to the compiler,
 and use config.h (not wolfssl/options.h) to communicate
 LIBWOLFSSL_CONFIGURE_ARGS and LIBWOLFSSL_GLOBAL_CFLAGS to the compiler (for
 logging.c).

---
 configure.ac            | 20 ++++++--------------
 wolfcrypt/src/logging.c |  4 ----
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/configure.ac b/configure.ac
index 6a2742de2..383b4f8be 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5791,9 +5791,7 @@ if test "$ax_enable_debug" = "yes" ||
 	     test "$ENABLED_LEANPSK" = "no" &&
 	     test "$ENABLED_LOWRESOURCE" = "no")
 then
-    WC_INTROSPECTION=yes
-else
-    WC_INTROSPECTION=no
+    AM_CFLAGS="$AM_CFLAGS -DHAVE_WC_INTROSPECTION"
 fi
 
 CREATE_HEX_VERSION
@@ -5845,17 +5843,6 @@ echo "extern \"C\" {" >> $OPTION_FILE
 echo "#endif" >> $OPTION_FILE
 echo "" >> $OPTION_FILE
 
-echo "#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"" >> $OPTION_FILE
-echo >> $OPTION_FILE
-echo "#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"" >> $OPTION_FILE
-echo >> $OPTION_FILE
-
-if test "$WC_INTROSPECTION" = "yes"
-then
-    echo "#define HAVE_WC_INTROSPECTION" >> $OPTION_FILE
-    echo >> $OPTION_FILE
-fi
-
 for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
     defonly=`echo $option | sed 's/^-D//'`
     if test "$defonly" != "$option"
@@ -6111,6 +6098,11 @@ echo "   * Crypto callbacks:           $ENABLED_CRYPTOCB"
 echo ""
 echo "---"
 
+echo >> config.h
+echo "#define LIBWOLFSSL_CONFIGURE_ARGS \"$ac_configure_args\"" >> config.h
+echo >> config.h
+echo "#define LIBWOLFSSL_GLOBAL_CFLAGS \"$CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS\"" >> config.h
+
 ################################################################################
 # Show warnings at bottom so they are noticed
 ################################################################################
diff --git a/wolfcrypt/src/logging.c b/wolfcrypt/src/logging.c
index d61601151..738cc5419 100644
--- a/wolfcrypt/src/logging.c
+++ b/wolfcrypt/src/logging.c
@@ -24,10 +24,6 @@
     #include <config.h>
 #endif
 
-#ifndef WOLFSSL_USER_SETTINGS
-    #include <wolfssl/options.h>
-#endif
-
 #include <wolfssl/wolfcrypt/settings.h>
 
 #include <wolfssl/wolfcrypt/logging.h>