clones/php-src
1
0
Fork 0
mirror of https://github.com/php/php-src.git synced 2024-09-22 10:27:25 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'PHP-7.4'

Browse Source 
* PHP-7.4:
  Automatically remove aclocal.m4 if present
This commit is contained in:
Peter Kokot 2019-04-28 21:05:58 +02:00
commit 9e682ec0be
2 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
build/build.mk
View File

@ -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

4
scripts/phpize.in
View File

@ -157,6 +157,10 @@ phpize_replace_prefix()
phpize_autotools()
{
# Remove aclocal.m4 if present. It is automatically included by autoconf but
# not used by the PHP build system since PHP 7.4.
rm -f aclocal.m4
$PHP_AUTOCONF || exit 1
$PHP_AUTOHEADER || exit 1