From: Filipe Brandenburger <filbranden@google.com>
Date: Tue, 22 Sep 2015 16:41:32 +0000 (-0700)
Subject: build-sys: properly quote m4 macro arguments in CC_CHECK_FLAGS_APPEND
X-Git-Tag: v227.2^2~27
X-Git-Url: http://www.chiark.greenend.org.uk/ucgi/~ianmdlvl/git?p=elogind.git;a=commitdiff_plain;h=de2820284a3c2905f0a76bf3fd196ce3a37f775a

build-sys: properly quote m4 macro arguments in CC_CHECK_FLAGS_APPEND

The variables should be quoted inside [...] to avoid double macro
expansion.  This is currently not an issue, since the values (-W...) are
not really macros, but we might as well just fix that issue now.

Tested by re-running autogen.sh and comparing the value of OUR_CFLAGS in
the generated Makefile.  Ran a full build from a clean tree to confirm
no other issues were introduced.
---

diff --git a/m4/attributes.m4 b/m4/attributes.m4
index 97f094b07..4b0fcdce3 100644
--- a/m4/attributes.m4
+++ b/m4/attributes.m4
@@ -54,8 +54,8 @@ AC_DEFUN([CC_CHECK_FLAG_APPEND], [
 
 dnl CC_CHECK_FLAGS_APPEND([WHERE-TO-APPEND], [ENV-VAR], [FLAG1 FLAG2])
 AC_DEFUN([CC_CHECK_FLAGS_APPEND], [
-  for flag in $3; do
-    CC_CHECK_FLAG_APPEND($1, $2, $flag)
+  for flag in [$3]; do
+    CC_CHECK_FLAG_APPEND([$1], [$2], $flag)
   done
 ])