com php-src: Merge branch 'PHP-7.1' into PHP-7.2: .gitignore ext/ext_skel scripts/phpize.in scripts/phpize.m4
| From: | Peter Kokot | Date: | Thu, 18 Oct 2018 22:07:42 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.1' into PHP-7.2: .gitignore ext/ext_skel scripts/phpize.in scripts/phpize.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103510@lists.php.net to get a copy of this message | ||
Commit: 5531dde5e977dfa942e120da4a4d647688a76c2b
Author: Peter Kokot <peterkokot@gmail.com> Fri, 19 Oct 2018 00:07:42 +0200
Parents: de9f325c12d631d0fcbb90d0e5cf34235d9d6073 4be0528476763d8c6bfb7a47ad62278c187ef400
Branches: PHP-7.2 PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=5531dde5e977dfa942e120da4a4d647688a76c2b
Log:
Merge branch 'PHP-7.1' into PHP-7.2
* PHP-7.1:
[ci skip] Update NEWS
Fix #77035: The phpize and ./configure create redundant .deps file
Bugs:
https://bugs.php.net/77035
Changed paths:
MM .gitignore
MM ext/ext_skel
MM scripts/phpize.in
MM scripts/phpize.m4
Diff:
diff --cc scripts/phpize.in
index e67e3d9,99250da..afec191
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@@ -11,8 -11,8 +11,8 @@@ SED="@SED@
FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
FILES="acinclude.m4 Makefile.global config.sub config.guess ltmain.sh run-tests*.php"
- CLEAN_FILES="$FILES *.o *.lo *.la .deps .libs/ build/ modules/ install-sh \
+ CLEAN_FILES="$FILES *.o *.lo *.la .libs/ build/ modules/ install-sh \
- mkinstalldirs missing config.nice config.sub config.guess configure configure.in \
+ mkinstalldirs missing config.nice config.sub config.guess configure configure.ac \
aclocal.m4 config.h config.h.in conftest* ltmain.sh libtool config.cache autom4te.cache/ \
config.log config.status Makefile Makefile.fragments Makefile.objects confdefs.h \
run-tests*.php tests/*.diff tests/*.exp tests/*.log tests/*.out tests/*.php"