diff --git a/configure.ac b/configure.ac
index abac45d713146..8a72858122033 100644
--- a/configure.ac
+++ b/configure.ac
@@ -1726,45 +1726,89 @@ PHP_ADD_SOURCES(main/streams, streams.c cast.c memory.c filter.c \
 PHP_ADD_SOURCES(/main, internal_functions.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, sapi)
 PHP_ADD_SOURCES_X(/main, internal_functions_cli.c, -DZEND_ENABLE_STATIC_TSRMLS_CACHE=1, PHP_BINARY_OBJS)
 
-PHP_ADD_SOURCES(Zend, \
-    zend_language_parser.c zend_language_scanner.c \
-    zend_ini_parser.c zend_ini_scanner.c \
-    zend_alloc.c zend_call_stack.c zend_compile.c zend_constants.c zend_dtrace.c \
-    zend_execute_API.c zend_highlight.c zend_llist.c \
-    zend_vm_opcodes.c zend_opcode.c zend_operators.c zend_ptr_stack.c zend_stack.c \
-    zend_variables.c zend.c zend_API.c zend_extensions.c zend_hash.c \
-    zend_list.c zend_builtin_functions.c zend_attributes.c zend_execute.c \
-    zend_ini.c zend_sort.c zend_multibyte.c zend_stream.c \
-    zend_iterators.c zend_interfaces.c zend_exceptions.c zend_strtod.c zend_gc.c \
-    zend_closures.c zend_weakrefs.c zend_float.c zend_string.c zend_signal.c zend_generators.c \
-    zend_virtual_cwd.c zend_ast.c zend_objects.c zend_object_handlers.c zend_objects_API.c \
-    zend_default_classes.c zend_inheritance.c zend_smart_str.c zend_cpuinfo.c zend_gdb.c \
-    zend_observer.c zend_system_id.c zend_enum.c zend_fibers.c zend_atomic.c \
-    zend_max_execution_timer.c \
-    zend_hrtime.c \
-    zend_frameless_function.c \
-	Optimizer/zend_optimizer.c \
-	Optimizer/pass1.c \
-	Optimizer/pass3.c \
-	Optimizer/optimize_func_calls.c \
-	Optimizer/block_pass.c \
-	Optimizer/optimize_temp_vars_5.c \
-	Optimizer/nop_removal.c \
-	Optimizer/compact_literals.c \
-	Optimizer/zend_cfg.c \
-	Optimizer/zend_dfg.c \
-	Optimizer/dfa_pass.c \
-	Optimizer/zend_ssa.c \
-	Optimizer/zend_inference.c \
-	Optimizer/zend_func_info.c \
-	Optimizer/zend_call_graph.c \
-	Optimizer/sccp.c \
-	Optimizer/scdf.c \
-	Optimizer/dce.c \
-	Optimizer/escape_analysis.c \
-	Optimizer/compact_vars.c \
-	Optimizer/zend_dump.c \
-    , [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $fiber_asm_cflag])
+PHP_ADD_SOURCES([Zend], [m4_normalize([
+  Optimizer/block_pass.c
+  Optimizer/compact_literals.c
+  Optimizer/compact_vars.c
+  Optimizer/dce.c
+  Optimizer/dfa_pass.c
+  Optimizer/escape_analysis.c
+  Optimizer/nop_removal.c
+  Optimizer/optimize_func_calls.c
+  Optimizer/optimize_temp_vars_5.c
+  Optimizer/pass1.c
+  Optimizer/pass3.c
+  Optimizer/sccp.c
+  Optimizer/scdf.c
+  Optimizer/zend_call_graph.c
+  Optimizer/zend_cfg.c
+  Optimizer/zend_dfg.c
+  Optimizer/zend_dump.c
+  Optimizer/zend_func_info.c
+  Optimizer/zend_inference.c
+  Optimizer/zend_optimizer.c
+  Optimizer/zend_ssa.c
+  zend_alloc.c
+  zend_API.c
+  zend_ast.c
+  zend_atomic.c
+  zend_attributes.c
+  zend_builtin_functions.c
+  zend_call_stack.c
+  zend_closures.c
+  zend_compile.c
+  zend_constants.c
+  zend_cpuinfo.c
+  zend_default_classes.c
+  zend_dtrace.c
+  zend_enum.c
+  zend_exceptions.c
+  zend_execute_API.c
+  zend_execute.c
+  zend_extensions.c
+  zend_fibers.c
+  zend_float.c
+  zend_frameless_function.c
+  zend_gc.c
+  zend_gdb.c
+  zend_generators.c
+  zend_hash.c
+  zend_highlight.c
+  zend_hrtime.c
+  zend_inheritance.c
+  zend_ini_parser.c
+  zend_ini_scanner.c
+  zend_ini.c
+  zend_interfaces.c
+  zend_iterators.c
+  zend_language_parser.c
+  zend_language_scanner.c
+  zend_list.c
+  zend_llist.c
+  zend_max_execution_timer.c
+  zend_multibyte.c
+  zend_object_handlers.c
+  zend_objects_API.c
+  zend_objects.c
+  zend_observer.c
+  zend_opcode.c
+  zend_operators.c
+  zend_ptr_stack.c
+  zend_signal.c
+  zend_smart_str.c
+  zend_sort.c
+  zend_stack.c
+  zend_stream.c
+  zend_string.c
+  zend_strtod.c
+  zend_system_id.c
+  zend_variables.c
+  zend_virtual_cwd.c
+  zend_vm_opcodes.c
+  zend_weakrefs.c
+  zend.c
+])],
+  [-DZEND_ENABLE_STATIC_TSRMLS_CACHE=1 $fiber_asm_cflag])
 
 PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/scripts/Makefile.frag,$abs_srcdir/scripts,scripts)
 PHP_ADD_MAKEFILE_FRAGMENT($abs_srcdir/Zend/Makefile.frag,$abs_srcdir/Zend,Zend)