wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 20:24:39 +02:00
Code Issues Packages Projects Releases Wiki Activity

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).

Browse Source
This commit is contained in:
Daniel Pouzzner
2020-10-28 17:17:06 -05:00
parent fda84576b0
commit 7d177e78d7
2 changed files with 6 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

20
configure.ac
View File

@@ -5791,9 +5791,7 @@ if test "$ax_enable_debug" = "yes" ||
test "$ENABLED_LEANPSK" = "no" && test "$ENABLED_LEANPSK" = "no" &&
test "$ENABLED_LOWRESOURCE" = "no") test "$ENABLED_LOWRESOURCE" = "no")
then then
WC_INTROSPECTION=yes AM_CFLAGS="$AM_CFLAGS -DHAVE_WC_INTROSPECTION"
else
WC_INTROSPECTION=no
fi fi
CREATE_HEX_VERSION CREATE_HEX_VERSION
@@ -5845,17 +5843,6 @@ echo "extern \"C\" {" >> $OPTION_FILE
echo "#endif" >> $OPTION_FILE echo "#endif" >> $OPTION_FILE
echo "" >> $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 for option in $CPPFLAGS $AM_CPPFLAGS $CFLAGS $AM_CFLAGS; do
defonly=`echo $option | sed 's/^-D//'` defonly=`echo $option | sed 's/^-D//'`
if test "$defonly" != "$option" if test "$defonly" != "$option"
@@ -6111,6 +6098,11 @@ echo " * Crypto callbacks: $ENABLED_CRYPTOCB"
echo "" echo ""
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 # Show warnings at bottom so they are noticed
################################################################################ ################################################################################

4
wolfcrypt/src/logging.c
View File

@@ -24,10 +24,6 @@
#include <config.h> #include <config.h>
#endif #endif
#ifndef WOLFSSL_USER_SETTINGS
#include <wolfssl/options.h>
#endif
#include <wolfssl/wolfcrypt/settings.h> #include <wolfssl/wolfcrypt/settings.h>
#include <wolfssl/wolfcrypt/logging.h> #include <wolfssl/wolfcrypt/logging.h>