summaryrefslogtreecommitdiff
path: root/build
diff options
context:
space:
mode:
authorPeter Kokot <peterkokot@gmail.com>2019-04-25 22:44:56 +0200
committerPeter Kokot <peterkokot@gmail.com>2019-04-28 21:05:34 +0200
commitf9db357623434e8583a22553d26aeaa375b97e05 (patch)
treea5b1da6a02f0758b7ed3856e6cc11380f5aaab2c /build
parent78bed33862f361a0da96d4d2257ab8725055720b (diff)
downloadphp-git-f9db357623434e8583a22553d26aeaa375b97e05.tar.gz
Automatically remove aclocal.m4 if present
Commit 4e7064d173d2b5b22e159fcf52d22b10213b67b8 removed the usage of `aclocal.m4`. When using Git repositories, many times cleaning of the generated files is not done prior to running phpize or buildconf. For example: git clone git://github.com/php/php-src cd php-src git checkout PHP-7.3 ./buildconf ./configure git checkout PHP-7.4 ./buildconf # -> warnings ./configure # -> errors To not accidentally include `aclocal.m4` file in the generated configure this enhances build system experience a bit more by removing aclocal.m4 file prior to start building configure file using phpize or buildconf.
Diffstat (limited to 'build')
-rw-r--r--build/build.mk4
1 files changed, 3 insertions, 1 deletions
diff --git a/build/build.mk b/build/build.mk
index 2e261b7824..678cbe90af 100644
--- a/build/build.mk
+++ b/build/build.mk
@@ -31,8 +31,10 @@ $(stamp): build/buildcheck.sh
@build/buildcheck.sh $@
configure: configure.ac $(PHP_M4_FILES)
+# Remove aclocal.m4 if present. It is automatically included by autoconf but
+# not used by the PHP build system since PHP 7.4.
@echo rebuilding $@
- @rm -f $@
+ @rm -f $@ aclocal.m4
@$(PHP_AUTOCONF) $(PHP_AUTOCONF_FLAGS)
$(config_h_in): configure