summaryrefslogtreecommitdiff
path: root/.gitignore
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-03-13 00:25:07 +0100
committerPeter Kokot <peterkokot@gmail.com>2019-04-23 20:28:45 +0200
commit4e7064d173d2b5b22e159fcf52d22b10213b67b8 (patch)
tree3741ce291c096fa1cf990bf98a5010f5bac65adc /.gitignore
parent96a9fb20522fd92295b6191ff57deaa671f0bea5 (diff)
downloadphp-git-4e7064d173d2b5b22e159fcf52d22b10213b67b8.tar.gz
Move acinclude.m4 to build/php.m4
The acinclude.m4 file is in a usual Autotools build processed with Automake's aclocal tool. Since PHP currently doesn't use Automake and aclocal this file can be moved into the build directory. PHP build system currently generates a combined aclocal.m4 file that Autoconf can processes automatically. However, a newer practice is writing all local macros in separate dedicated files prefixed with package name, in PHP's case PHP_MACRO_NAME and putting them in a common `m4` directory. PHP uses currently `build` directory for this purpose. Name `php.m4` probably most resembles such file for PHP's case. PHP manually created the aclocal.m4 file from acinclude.m4 and build/libtool.m4. Which is also not a particularly good practice [1], so this patch also removes the generated alocal.m4 usage and uses m4_include() calls manually in the configure.ac and phpize.m4 files manually. - sort order is not important but can be alphabetical - list of *.m4 files prerequisites for configure script generation updated - Moving m4_include() before AC_INIT also removes all comments starting with hash character (`#`) in the included files. [1] https://autotools.io/autoconf/macros.html
Diffstat (limited to '.gitignore')
-rw-r--r--.gitignore4
1 files changed, 0 insertions, 4 deletions
diff --git a/.gitignore b/.gitignore
index 52ab256ba3..d0aa3b394a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -38,9 +38,6 @@
# Standard object files generated during build process
*.o
-# Generated by `./buildconf` or `phpize`
-aclocal.m4
-
# Cache directories generated by Autoconf tools - autoconf, autoreconf...
autom4te.cache/
@@ -174,7 +171,6 @@ php
# ------------------------------------------------------------------------------
# Extensions files additionally generated by `cd ext/name && phpize && ./configure`
# ------------------------------------------------------------------------------
-/ext/*/acinclude.m4
/ext/*/build/
/ext/*/configure.ac
/ext/*/run-tests.php