Remove more leftovers of PHP_DEFINE handling

diff --git a/.gitignore b/.gitignore
index 4fd4da9b37b8fc1ec46f26af97b636864dd85095..1eab1d32ac417568cd985478606127cfadb1480e 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -89,16 +89,6 @@ build/PHP-Parser-*
 config.h
 config.h.in
 /ext/date/lib/timelib_config.h
-/ext/iconv/php_have_bsd_iconv.h
-/ext/iconv/php_have_glibc_iconv.h
-/ext/iconv/php_have_ibm_iconv.h
-/ext/iconv/php_have_iconv.h
-/ext/iconv/php_have_libiconv.h
-/ext/iconv/php_iconv_aliased_libiconv.h
-/ext/iconv/php_iconv_broken_ignore.h
-/ext/iconv/php_iconv_supports_errno.h
-/ext/iconv/php_php_iconv_h_path.h
-/ext/iconv/php_php_iconv_impl.h
 /main/build-defs.h
 /main/php_config.h.in
 /main/php_config.h

diff --git a/build/Makefile.global b/build/Makefile.global
index 032f7f50429af2211b50f64050909c689c2282e0..ae797408b5fe919dfdb5dbf367f176a93b133097 100644 (file)
--- a/build/Makefile.global
+++ b/build/Makefile.global
@@ -123,7 +123,6 @@ distclean: clean
        rm -f ext/date/lib/timelib_config.h ext/mbstring/libmbfl/config.h ext/oci8/oci8_dtrace_gen.h ext/oci8/oci8_dtrace_gen.h.bak
        rm -f scripts/man1/phpize.1 scripts/php-config scripts/man1/php-config.1 sapi/cli/php.1 sapi/cgi/php-cgi.1 sapi/phpdbg/phpdbg.1 ext/phar/phar.1 ext/phar/phar.phar.1
        rm -f sapi/fpm/php-fpm.conf sapi/fpm/init.d.php-fpm sapi/fpm/php-fpm.service sapi/fpm/php-fpm.8 sapi/fpm/status.html
-       rm -f ext/iconv/php_have_bsd_iconv.h ext/iconv/php_have_glibc_iconv.h ext/iconv/php_have_ibm_iconv.h ext/iconv/php_have_iconv.h ext/iconv/php_have_libiconv.h ext/iconv/php_iconv_aliased_libiconv.h ext/iconv/php_iconv_supports_errno.h ext/iconv/php_php_iconv_h_path.h ext/iconv/php_php_iconv_impl.h
        rm -f ext/phar/phar.phar ext/phar/phar.php
        rm -f ext/opcache/jit/zend_jit_x86.c
        if test "$(srcdir)" != "$(builddir)"; then \

diff --git a/build/php.m4 b/build/php.m4
index 34f671e29cbb23a201fe41a9159ecf4f0b8f6a50..70a7e34d93379380c0442d1791e4587c6cb170bd 100644 (file)
--- a/build/php.m4
+++ b/build/php.m4
@@ -1924,19 +1924,6 @@ AC_DEFUN([PHP_SETUP_ICONV], [
   found_iconv=no
   unset ICONV_DIR
 
-  dnl Create the directories for a VPATH build.
-  $php_shtool mkdir -p ext/iconv
-
-  echo > ext/iconv/php_have_bsd_iconv.h
-  echo > ext/iconv/php_have_ibm_iconv.h
-  echo > ext/iconv/php_have_glibc_iconv.h
-  echo > ext/iconv/php_have_libiconv.h
-  echo > ext/iconv/php_have_iconv.h
-  echo > ext/iconv/php_php_iconv_impl.h
-  echo > ext/iconv/php_iconv_aliased_libiconv.h
-  echo > ext/iconv/php_php_iconv_h_path.h
-  echo > ext/iconv/php_iconv_supports_errno.h
-
   dnl Check libc first if no path is provided in --with-iconv.
   if test "$PHP_ICONV" = "yes"; then
     dnl Reset LIBS temporarily as it may have already been included -liconv in.

diff --git a/ext/iconv/config.m4 b/ext/iconv/config.m4
index b3291e41c3eccc6365f03d747b18ed08e641ebfb..59b89824bfbd23d2af7dccae28c59e88dc1797e2 100644 (file)
--- a/ext/iconv/config.m4
+++ b/ext/iconv/config.m4
@@ -89,11 +89,6 @@ int main() {
       ])
     fi
 
-    echo > ext/iconv/php_have_bsd_iconv.h
-    echo > ext/iconv/php_have_glibc_iconv.h
-    echo > ext/iconv/php_have_libiconv.h
-    echo > ext/iconv/php_have_ibm_iconv.h
-
     case "$iconv_impl_name" in
       gnu_libiconv [)]
         AC_DEFINE([PHP_ICONV_IMPL],["libiconv"],[Which iconv implementation to use])