1 files changed, 3 insertions, 3 deletions

diff --git a/config.m4 b/config.m4
index a6dade9..23081dd 100644
--- a/config.m4
+++ b/config.m4
@@ -5,7 +5,7 @@ PHP_ARG_ENABLE(suhosin7, whether to enable suhosin support,
 [  --enable-suhosin7        Enable suhosin support])
 
 if test "$PHP_SUHOSIN7" != "no"; then
-        PHP_NEW_EXTENSION(suhosin7, suhosin7.c ifilter.c memory_limit.c aes.c treat_data.c log.c execute.c execute_ih.c execute_rnd.c crypt.c cookiecrypt.c header.c session.c, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
+        PHP_NEW_EXTENSION(suhosin7, suhosin7.c ifilter.c memory_limit.c aes.c treat_data.c log.c execute.c execute_ih.c execute_rnd.c crypt.c cookiecrypt.c header.c session.c ex_imp.c rfc1867.c ufilter.c post_handler.c, $ext_shared,, [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1])
         PHP_ADD_EXTENSION_DEP(suhosin7, hash)
         echo "===== WARNING ============================================"
         echo "  Suhosin7 for PHP 7 is in alpha stage at the moment and"
@@ -29,7 +29,7 @@ fi
 
 AC_MSG_CHECKING([for C11 support with -std=c11])
 old_CFLAGS="$CFLAGS"
-CFLAGS+=" -std=c11"
+CFLAGS="${CFLAGS} -std=c11"
 AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT([yes])],[
         AC_MSG_RESULT([no])
         CFLAGS="$old_CFLAGS"
@@ -38,7 +38,7 @@ AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT([yes])],[
         echo "  support. Trying C99 instead, but compiling may fail."
         echo "=========================================================="
         AC_MSG_CHECKING([for C99 support with -std=c99])
-        CFLAGS+=" -std=c99"
+        CFLAGS="${CFLAGS} -std=c99"
         AC_COMPILE_IFELSE([AC_LANG_PROGRAM([],[])],[AC_MSG_RESULT([yes])],[
                 AC_MSG_RESULT([no])
                 CFLAGS="$old_CFLAGS"