com php-src: Merge branch 'PHP-7.2' into PHP-7.3: .gitignore ext/skeleton/.gitignore.in scripts/phpize.in scripts/phpize.m4
| From: | Peter Kokot | Date: | Thu, 18 Oct 2018 22:10:22 +0000 |
| Subject: | com php-src: Merge branch 'PHP-7.2' into PHP-7.3: .gitignore ext/skeleton/.gitignore.in scripts/phpize.in scripts/phpize.m4 | ||
| Groups: | php.cvs | ||
| Request: | Send a blank email to php-cvs+get-103512@lists.php.net to get a copy of this message | ||
Commit: 74131ca342bc8cc5367d2a6e70402df1ca3d1463
Author: Peter Kokot <peterkokot@gmail.com> Fri, 19 Oct 2018 00:10:22 +0200
Parents: 93427292f6df9da7d6a9b567e092d5d73d8b19e4 b9d8e5d706e36b7e8bb8bdd26bc93374fd9a6020
Branches: PHP-7.3 master
Link: http://git.php.net/?p=php-src.git;a=commitdiff;h=74131ca342bc8cc5367d2a6e70402df1ca3d1463
Log:
Merge branch 'PHP-7.2' into PHP-7.3
* PHP-7.2:
[ci skip] Update NEWS
[ci skip] Update NEWS
Fix #77035: The phpize and ./configure create redundant .deps file
Bugs:
https://bugs.php.net/77035
Changed paths:
MM .gitignore
MA ext/skeleton/.gitignore.in
MM scripts/phpize.in
MM scripts/phpize.m4
Diff:
diff --cc ext/skeleton/.gitignore.in
index 912ca92,0000000..91bef25
mode 100644,000000..100644
--- a/ext/skeleton/.gitignore.in
+++ b/ext/skeleton/..gitignore.in
@@@ -1,36 -1,0 +1,35 @@@
- .deps
+*.lo
+*.la
+.libs
+acinclude.m4
+aclocal.m4
+autom4te.cache
+build
+config..guess
+config.h
+config.h.in
+config.log
+config.nice
+config.status
+config.sub
+configure
+configure.ac
+configure.in
+include
+install-sh
+libtool
+ltmain.sh
+Makefile
+Makefile.fragments
+Makefile.global
+Makefile.objects
+missing
+mkinstalldirs
+modules
+run-tests.php
+tests/*/*.diff
+tests/*/*.out
+tests/*/*.php
+tests/*/*.exp
+tests/*/*.log
+tests/*/*.sh
diff --cc scripts/phpize.in
index 3e81ad4,afec191..74e8bc3
--- a/scripts/phpize.in
+++ b/scripts/phpize.in
@@@ -9,9 -9,9 +9,9 @@@ includedir="
eval echo @includedir@/ph
builddir="pwd"
SED="@SED@"
-FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4"
+FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4
ax_gcc_func_attribute.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.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 \
diff --cc scripts/phpize.m4
index 55fa08d,8496518..a37ea01
--- a/scripts/phpize.m4
+++ b/scripts/phpize.m4
@@@ -195,8 -195,7 +195,7 @@@ PHP_GEN_BUILD_DIR
PHP_GEN_GLOBAL_MAKEFILE
test -d modules || $php_shtool mkdir modules
- touch .deps
-AC_CONFIG_HEADER(config.h)
+AC_CONFIG_HEADERS([config.h])
-AC_OUTPUT()
+AC_OUTPUT