From 943b576e1fdfbc9fc5b20868e98a7f980ae33000 Mon Sep 17 00:00:00 2001
From: chros <chros@chrosGX620>
Date: Sun, 30 Jul 2017 20:37:21 +0100
Subject: [PATCH 1/2] Fix compilation issue with gcc v6.x and empty CXXFLAGS
 (See #20)

---
 configure.ac            |  1 +
 scripts/rak_compiler.m4 | 13 +++++++++++++
 2 files changed, 14 insertions(+)

diff --git a/configure.ac b/configure.ac
index f0629038..c3e91fb6 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(config.h)
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
+RAK_CHECK_CXXFLAGS
 RAK_ENABLE_DEBUG
 RAK_ENABLE_EXTRA_DEBUG
 RAK_ENABLE_WERROR
diff --git a/scripts/rak_compiler.m4 b/scripts/rak_compiler.m4
index 39bd19a7..87871abf 100644
--- a/scripts/rak_compiler.m4
+++ b/scripts/rak_compiler.m4
@@ -1,3 +1,16 @@
+AC_DEFUN([RAK_CHECK_CXXFLAGS], [
+
+  AC_MSG_CHECKING([for user-defined CXXFLAGS])
+
+  if test -n "$CXXFLAGS"; then
+    AC_MSG_RESULT([user-defined "$CXXFLAGS"])
+  else
+    CXXFLAGS="-O2"
+    AC_MSG_RESULT([default "$CXXFLAGS"])
+  fi
+])
+
+
 AC_DEFUN([RAK_ENABLE_DEBUG], [
   AC_ARG_ENABLE(debug,
     AC_HELP_STRING([--enable-debug], [enable debug information [[default=yes]]]),

From 1a4f6dab1ab5e0e29dc1a96be13a009455bfafb2 Mon Sep 17 00:00:00 2001
From: chros <chros@chrosGX620>
Date: Wed, 2 Aug 2017 12:51:03 +0100
Subject: [PATCH 2/2] Modfiy gcc v6.x fix for empty CXXFLAGS (See #20)

---
 configure.ac            |  1 +
 scripts/rak_compiler.m4 | 21 +++++++++++++++++----
 2 files changed, 18 insertions(+), 4 deletions(-)

diff --git a/configure.ac b/configure.ac
index c3e91fb6..feb28e2b 100644
--- a/configure.ac
+++ b/configure.ac
@@ -8,6 +8,7 @@ AC_CONFIG_HEADERS(config.h)
 AC_PROG_CXX
 AC_PROG_LIBTOOL
 
+RAK_CHECK_CFLAGS
 RAK_CHECK_CXXFLAGS
 RAK_ENABLE_DEBUG
 RAK_ENABLE_EXTRA_DEBUG
diff --git a/scripts/rak_compiler.m4 b/scripts/rak_compiler.m4
index 87871abf..9a361bed 100644
--- a/scripts/rak_compiler.m4
+++ b/scripts/rak_compiler.m4
@@ -1,12 +1,25 @@
+AC_DEFUN([RAK_CHECK_CFLAGS], [
+
+  AC_MSG_CHECKING([for user-defined CFLAGS])
+
+  if test "$CFLAGS" = ""; then
+    unset CFLAGS
+    AC_MSG_RESULT([undefined])
+  else
+    AC_MSG_RESULT([user-defined "$CFLAGS"])
+  fi
+])
+
+
 AC_DEFUN([RAK_CHECK_CXXFLAGS], [
 
   AC_MSG_CHECKING([for user-defined CXXFLAGS])
 
-  if test -n "$CXXFLAGS"; then
-    AC_MSG_RESULT([user-defined "$CXXFLAGS"])
+  if test "$CXXFLAGS" = ""; then
+    unset CXXFLAGS
+    AC_MSG_RESULT([undefined])
   else
-    CXXFLAGS="-O2"
-    AC_MSG_RESULT([default "$CXXFLAGS"])
+    AC_MSG_RESULT([user-defined "$CXXFLAGS"])
   fi
 ])