Merge branch 'PHP-7.4'

* PHP-7.4:
  Move acinclude.m4 to build/php.m4

diff --cc .gitignore
index 2b3c697aadd643fb92cad750d2d7b64e014fe364,d0aa3b394a9d0657389138be1112828e16427975..84f37445c8dce568953acfc61eb0d2b8e8115c51
--- 1/.gitignore
--- 2/.gitignore
+++ b/.gitignore
@@@ -172,15 -169,8 +169,14 @@@ ph
  /Zend/zend_language_parser.output
  
  # ------------------------------------------------------------------------------
 -# Extensions files additionally generated by `cd ext/name && phpize && ./configure`
 +# Extensions files
  # ------------------------------------------------------------------------------
- /ext/*/acinclude.m4
 +
 +# Miscellaneous extensions files
 +/ext/opcache/jit/zend_jit_x86.c
 +/ext/opcache/minilua
 +
 +# Generated by `cd ext/name && phpize && ./configure`
  /ext/*/build/
  /ext/*/configure.ac
  /ext/*/run-tests.php

diff --cc build/php.m4
Simple merge

diff --cc configure.ac
Simple merge

diff --cc docs/unix-build-system.md
Simple merge