From 477d2413cd8ad2f6e44b55abdb06d34bd6d80d39 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Tue, 27 Mar 2018 10:23:44 -0700
Subject: [PATCH 1/3] Configure Update 1. Initialize CXXFLAGS (C++ compiler
 flags) the same way we do CFLAGS. 2. Add CPPFLAGS (C preprocessor flags) to
 the options.h file with the other CFLAGS.

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

diff --git a/configure.ac b/configure.ac
index 3fe2399ea..769f3f75f 100644
--- a/configure.ac
+++ b/configure.ac
@@ -10,9 +10,11 @@ AC_INIT([wolfssl],[3.14.0],[https://github.com/wolfssl/wolfssl/issues],[wolfssl]
 
 AC_CONFIG_AUX_DIR([build-aux])
 
-# The following sets CFLAGS to empty if unset on command line. We do not want
-# the default "-g -O2" that AC_PROG_CC sets automatically.
+# The following sets CFLAGS and CXXFLAGS to empty if unset on command line.
+# We do not want the default "-g -O2" that AC_PROG_CC AC_PROG_CXX sets
+# automatically.
 : ${CFLAGS=""}
+: ${CXXFLAGS=""}
 
 AC_CANONICAL_HOST
 AC_CANONICAL_BUILD
@@ -4104,7 +4106,7 @@ if test "$ENABLED_DISTRO" = "no"
 then
     CFLAGS="$CFLAGS $USER_C_EXTRA_FLAGS"
 fi
-OPTION_FLAGS="$USER_CFLAGS $USER_C_EXTRA_FLAGS $AM_CFLAGS"
+OPTION_FLAGS="$USER_CFLAGS $USER_C_EXTRA_FLAGS $CPPFLAGS $AM_CFLAGS"
 
 
 

From e6a19bb1e8ecae044c741d771f57ab905cb1ef20 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Tue, 27 Mar 2018 16:41:39 -0700
Subject: [PATCH 2/3] Configure Update Add a disable option to turn off the
 default optimization options so the user may set their own in a CFLAGS.

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

diff --git a/configure.ac b/configure.ac
index 769f3f75f..b0643c8c9 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3843,6 +3843,14 @@ then
 fi
 
 
+# Default optimization enable
+AC_ARG_ENABLE([optimized],
+    [AS_HELP_STRING([--enable-optimized],[Enable default optimization options (default: enabled)])],
+    [ ENABLED_OPTIMIZED=$enableval ],
+    [ ENABLED_OPTIMIZED=yes ]
+    )
+
+
 # check if PSK was enabled for conditionally running psk.test script
 AM_CONDITIONAL([BUILD_PSK], [test "x$ENABLED_PSK" = "xyes"])
 
@@ -4056,6 +4064,7 @@ then
     AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused"
     if test "$ax_enable_debug" = "no"
     then
+    AS_IF([test "x$ENABLED_OPTIMIZED" = "xyes"], [
         if test "$ENABLED_FASTMATH" = "yes"
         then
             AM_CFLAGS="$AM_CFLAGS $OPTIMIZE_FAST_CFLAGS"
@@ -4066,6 +4075,7 @@ then
         else
             AM_CFLAGS="$AM_CFLAGS $OPTIMIZE_CFLAGS"
         fi
+    ])
     fi
 fi
 

From e59bb43878299d4b2a31f54c0c0c990180fe3fc3 Mon Sep 17 00:00:00 2001
From: John Safranek <john@wolfssl.com>
Date: Wed, 28 Mar 2018 13:17:25 -0700
Subject: [PATCH 3/3] Configure Update Revise default compiler optimization
 flags enable name to something more descriptive.

---
 configure.ac | 12 ++++++------
 1 file changed, 6 insertions(+), 6 deletions(-)

diff --git a/configure.ac b/configure.ac
index b0643c8c9..1be4dbbdf 100644
--- a/configure.ac
+++ b/configure.ac
@@ -3843,11 +3843,11 @@ then
 fi
 
 
-# Default optimization enable
-AC_ARG_ENABLE([optimized],
-    [AS_HELP_STRING([--enable-optimized],[Enable default optimization options (default: enabled)])],
-    [ ENABLED_OPTIMIZED=$enableval ],
-    [ ENABLED_OPTIMIZED=yes ]
+# Default optimization CFLAGS enable
+AC_ARG_ENABLE([optflags],
+    [AS_HELP_STRING([--enable-optflags],[Enable default optimization CFLAGS for the compiler (default: enabled)])],
+    [ ENABLED_OPTFLAGS=$enableval ],
+    [ ENABLED_OPTFLAGS=yes ]
     )
 
 
@@ -4064,7 +4064,7 @@ then
     AM_CFLAGS="$AM_CFLAGS -Wall -Wno-unused"
     if test "$ax_enable_debug" = "no"
     then
-    AS_IF([test "x$ENABLED_OPTIMIZED" = "xyes"], [
+    AS_IF([test "x$ENABLED_OPTFLAGS" = "xyes"], [
         if test "$ENABLED_FASTMATH" = "yes"
         then
             AM_CFLAGS="$AM_CFLAGS $OPTIMIZE_FAST_CFLAGS"