diff --git a/configure.ac b/configure.ac
index 08308a93d..5ef4d13e0 100644
--- a/configure.ac
+++ b/configure.ac
@@ -5783,10 +5783,8 @@ AM_CONDITIONAL([BUILD_PKCS7],[test "x$ENABLED_PKCS7" = "xyes" || test "x$ENABLED
 AM_CONDITIONAL([BUILD_HASHFLAGS],[test "x$ENABLED_HASHFLAGS" = "xyes"])
 AM_CONDITIONAL([BUILD_LINUXKM],[test "$ENABLED_LINUXKM" = "yes"])
 AM_CONDITIONAL([BUILD_NO_LIBRARY],[test "$ENABLED_NO_LIBRARY" = "yes"])
-AM_CONDITIONAL([BUILD_DEBUG],[test "$ax_enable_debug" = "yes" || test "$ENABLED_STACKSIZE" = "yes"])
 AM_CONDITIONAL([BUILD_RC2],[test "x$ENABLED_RC2" = "xyes"])
 
-
 CREATE_HEX_VERSION
 AC_SUBST([AM_CPPFLAGS])
 AC_SUBST([AM_CFLAGS])
@@ -5836,6 +5834,11 @@ 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
+
 for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
     defonly=`echo $option | sed 's/^-D//'`
     if test "$defonly" != "$option"
diff --git a/src/include.am b/src/include.am
index 577a81e82..fc35cedf4 100644
--- a/src/include.am
+++ b/src/include.am
@@ -315,12 +315,8 @@ endif !BUILD_FIPS_RAND
 src_libwolfssl_la_SOURCES += \
                wolfcrypt/src/logging.c \
                wolfcrypt/src/wc_port.c \
-               wolfcrypt/src/error.c
-
-if BUILD_DEBUG
-src_libwolfssl_la_SOURCES += \
+               wolfcrypt/src/error.c \
                wolfcrypt/src/debug.c
-endif
 
 if !BUILD_FIPS_RAND
 src_libwolfssl_la_SOURCES += \
diff --git a/wolfcrypt/src/debug.c b/wolfcrypt/src/debug.c
index cf51fc639..30cca8669 100644
--- a/wolfcrypt/src/debug.c
+++ b/wolfcrypt/src/debug.c
@@ -27,6 +27,23 @@
 #include <wolfssl/wolfcrypt/settings.h>
 #include <wolfssl/wolfcrypt/wc_port.h>
 #include <wolfssl/wolfcrypt/types.h>
+#include <wolfssl/options.h>
+
+WOLFSSL_API const char *libwolfssl_configure_args(void) {
+#ifdef LIBWOLFSSL_CONFIGURE_ARGS
+  return " " LIBWOLFSSL_CONFIGURE_ARGS " ";
+#else
+  return NULL;
+#endif
+}
+
+WOLFSSL_API const char *libwolfssl_global_cflags(void) {
+#ifdef LIBWOLFSSL_GLOBAL_CFLAGS
+  return " " LIBWOLFSSL_GLOBAL_CFLAGS " ";
+#else
+  return NULL;
+#endif
+}
 
 #ifdef HAVE_STACK_SIZE_VERBOSE
 WOLFSSL_API THREAD_LS_T unsigned char *StackSizeCheck_myStack = NULL;
diff --git a/wolfssl/wolfcrypt/settings.h b/wolfssl/wolfcrypt/settings.h
index fc9e3d783..0001c11fb 100644
--- a/wolfssl/wolfcrypt/settings.h
+++ b/wolfssl/wolfcrypt/settings.h
@@ -221,6 +221,9 @@
 
 #include <wolfssl/wolfcrypt/visibility.h>
 
+WOLFSSL_API const char *libwolfssl_configure_args(void);
+WOLFSSL_API const char *libwolfssl_global_cflags(void);
+
 #ifdef WOLFSSL_USER_SETTINGS
     #include "user_settings.h"
 #elif defined(USE_HAL_DRIVER) && !defined(HAVE_CONFIG_H)