]> granicus.if.org Git - php/commitdiff
Merge branch 'PHP-7.3'
authorPeter Kokot <peterkokot@gmail.com>
Thu, 18 Oct 2018 22:12:48 +0000 (00:12 +0200)
committerPeter Kokot <peterkokot@gmail.com>
Thu, 18 Oct 2018 22:12:48 +0000 (00:12 +0200)
* PHP-7.3:
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  [ci skip] Update NEWS
  Fix #77035: The phpize and ./configure create redundant .deps file

1  2 
.gitignore
scripts/phpize.in
scripts/phpize.m4

diff --cc .gitignore
Simple merge
index 26ecfc6f650f80abf90cbe384375a07c5f39457f,74e8bc30d05c972cf5fa3bdd5aadef792d77baeb..3e863852f68da471e7d8687623a2493cc0af4901
@@@ -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 ax_gcc_func_attribute.m4"
 +FILES_BUILD="mkdep.awk scan_makefile_in.awk shtool libtool.m4 ax_check_compile_flag.m4 ax_gcc_func_attribute.m4 php_cxx_compile_stdcxx.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 \
Simple merge