Use eval in setting *FLAGS.

Signed-off-by: Rémi Denis-Courmont <remi@remlab.net>

diff --git a/m4/vlc.m4 b/m4/vlc.m4
index 38fd988057f59782118c4e7364410be3b0922d28..c4c738fce538facf25e2aab505b4bd2d6785a9a6 100644 (file)
--- a/m4/vlc.m4
+++ b/m4/vlc.m4
@@ -20,49 +20,49 @@ AC_DEFUN([VLC_ADD_PLUGIN], [
 dnl  Special cases: vlc, pics, plugins, save
 AC_DEFUN([VLC_ADD_CPPFLAGS], [
   m4_foreach_w([element], [$1], [
-    [CPPFLAGS_]element[="${CPPFLAGS_]element[} $2"]
+    [eval "CPPFLAGS_]element[="'"$'"{CPPFLAGS_]element[} $2"'"']
     [am_modules_with_cppflags="${am_modules_with_cppflags} ]element["]
   ])
 ])
 
 AC_DEFUN([VLC_ADD_CFLAGS], [
   m4_foreach_w([element], [$1], [
-    [CFLAGS_]element[="${CFLAGS_]element[} $2"]
+    [eval "CFLAGS_]element[="'"$'"{CFLAGS_]element[} $2"'"']
     [am_modules_with_cflags="${am_modules_with_cflags} ]element["]
   ])
 ])
 
 AC_DEFUN([VLC_ADD_CXXFLAGS], [
   m4_foreach_w([element], [$1], [
-    [CXXFLAGS_]element[="${CXXFLAGS_]element[} $2"]
+    [eval "CXXFLAGS_]element[="'"$'"{CXXFLAGS_]element[} $2"'"']
     [am_modules_with_cxxflags="${am_modules_with_cxxflags} ]element["]
   ])
 ])
 
 AC_DEFUN([VLC_ADD_OBJCFLAGS], [
   m4_foreach_w([element], [$1], [
-    [OBJCFLAGS_]element[="${OBJCFLAGS_]element[} $2"]
+    [eval "OBJCFLAGS_]element[="'"$'"{OBJCFLAGS_]element[} $2"'"']
     [am_modules_with_objcflags="${am_modules_with_objcflags} ]element["]
   ])
 ])
 
 AC_DEFUN([VLC_ADD_LDFLAGS], [
   m4_foreach_w([element], [$1], [
-    [LDFLAGS_]element[="${LDFLAGS_]element[} $2"]
+    [eval "LDFLAGS_]element[="'"$'"{LDFLAGS_]element[} $2"'"']
     [am_modules_with_ldflags="${am_modules_with_ldflags} ]element["]
   ])
 ])
 
 AC_DEFUN([VLC_ADD_LIBS], [
   m4_foreach_w([element], [$1], [
-    [LIBS_]element[="${LIBS_]element[} $2"]
+    [eval "LIBS_]element[="'"$'"{LIBS_]element[} $2"'"']
     [am_modules_with_libs="${am_modules_with_libs} ]element["]
   ])
 ])
 
 AC_DEFUN([VLC_SET_CFLAGS_WERROR], [
   m4_foreach_w([element], [$1], [
-    [CFLAGS_WERROR_]element[="${CFLAGS_WERROR_]element[} $2"]
+    [eval "CFLAGS_WERROR_]element[="'"'"$2"'"']
     [am_modules_with_werror="${am_modules_with_werror} ]element["]
   ])
 ])