configure: Make "standards" and "hardening" flags part of STRICT_CFLAGS.

Most importantly, don't assign them to CFLAGS which might be overwritten when
running make, thus leaving out the flags which were originally requested to be
used.

diff --git a/configure.ac b/configure.ac
index de18e156b7f891616c76d24661314cba8ac70e7f..e64e094ccbbfc20070a147acaa0a94528f9919ce 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -79,6 +79,8 @@ test_cc_flags() {
        return $ret
 }
 
+STRICT_CFLAGS=""
+
 m4_divert_once([HELP_ENABLE], [
 Build options:])
 
@@ -110,7 +112,7 @@ if test "x$enable_standards" = "xyes"; then
                AC_MSG_CHECKING([whether $CC accepts $flag])
 
                if test_cc_flags $flag; then
-                       CFLAGS="$CFLAGS $flag"
+                       STRICT_CFLAGS="$STRICT_CFLAGS $flag"
                        AC_MSG_RESULT([yes])
                else
                        AC_MSG_RESULT([no])
@@ -135,7 +137,7 @@ if test "x$enable_hardening" = "xyes"; then
                AC_MSG_CHECKING([whether $CC accepts $flag])
 
                if test_cc_flags $flag; then
-                       CFLAGS="$CFLAGS $flag"
+                       STRICT_CFLAGS="$STRICT_CFLAGS $flag"
                        hardening=$(($hardening + 1))
                        AC_MSG_RESULT([yes])
                else
@@ -155,7 +157,6 @@ AC_ARG_ENABLE([strict-checks],
                [enable_strict_checks="$enableval"],
                [enable_strict_checks="yes"])
 
-STRICT_CFLAGS=""
 for flag in -Wall -Werror; do
        AC_MSG_CHECKING([whether $CC accepts $flag])