commit 41aca8302756a8584513ea348c8e766e738a1ab0
author Konstantin Aladyshev <aladyshev22@gmail.com> Sat Mar 20 21:26:13 2021 +0300
committer Konstantin Aladyshev <aladyshev22@gmail.com> Wed Apr 14 08:34:55 2021 +0000
tree 32ebf5a6a2f76959c2f8d31f1da004bb04f841a7
parent 66ae67d36e952dc251236070721057aff17ca646

Fix bug with safe mode support option in configure

Configure script has multiple options that can affect CPPFLAGS.
But currently they can't be enabled together, the last option
just overrides the CPPFLAGS result, no matter what was the first
option value.
Because of this bug ENABLE_BOOT_FLAG_SAFE_MODE_SUPPORT is not defined
by default as it should be.

Signed-off-by: Konstantin Aladyshev <aladyshev22@gmail.com>
Change-Id: Ib7211d1306a757af256063aae8ed2b721f3d3e41

configure.ac

diff --git a/configure.ac b/configure.ac
index 824b778..2210296 100644
--- a/configure.ac
+++ b/configure.ac
@@ -31,7 +31,7 @@
 )
 AS_IF([test "x$enable_boot_flag_safe_mode_support" != "xno"],
     AC_MSG_NOTICE([Enabling safe mode option in boot flags])
-    [cpp_flags="-DENABLE_BOOT_FLAG_SAFE_MODE_SUPPORT"]
+    [cpp_flags="$cpp_flags -DENABLE_BOOT_FLAG_SAFE_MODE_SUPPORT"]
     AC_SUBST([CPPFLAGS], [$cpp_flags]),
     AC_MSG_WARN([Disabling safe mode option in boot flags])
 )
@@ -42,7 +42,7 @@
 )
 AS_IF([test "x$enable_i2c_whitelist_check" != "xno"],
     AC_MSG_NOTICE([Enabling I2C master write read command white list check])
-    [cpp_flags="-DENABLE_I2C_WHITELIST_CHECK"]
+    [cpp_flags="$cpp_flags -DENABLE_I2C_WHITELIST_CHECK"]
     AC_SUBST([CPPFLAGS], [$cpp_flags]),
     AC_MSG_WARN([Disabling I2C master write read command white list check])
 )