Remove TSRM configuration header

TSRM configuration header file was once created by separate autoconf
build system for TSRM and is with the current code not directly needed
like this anymore.

diff --git a/.gitignore b/.gitignore
index 72b591fd694129cc613ff1784cf1c49d2e524aa5..a81c8e38d91e3637d6d25889610f15455afcb2d8 100644 (file)
--- a/.gitignore
+++ b/.gitignore
@@ -96,7 +96,6 @@ config.h.in
 /main/build-defs.h
 /main/php_config.h.in
 /main/php_config.h
-/TSRM/tsrm_config.h
 /Zend/zend_config.h
 
 # ------------------------------------------------------------------------------

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 89eea4783f006b0f699d4e0a3aafef03dec4e917..3af42d9b6775bf5e70e1515ae46f1d27bb443ad9 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -17,7 +17,7 @@
 # define TSRM_WIN32
 # include "tsrm_config.w32.h"
 #else
-# include <tsrm_config.h>
+# include "main/php_config.h"
 #endif
 
 #include "main/php_stdint.h"

diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h
index d3c7672d48f626f1d08a1e6619aba5f0f69b00e4..dac64b04002d1f1f908975cd9c6675960baae4b7 100644 (file)
--- a/TSRM/tsrm_config_common.h
+++ b/TSRM/tsrm_config_common.h
@@ -10,7 +10,7 @@
 #ifdef TSRM_WIN32
 # include "tsrm_config.w32.h"
 #else
-# include <tsrm_config.h>
+# include "main/php_config.h"
 # include <sys/param.h>
 #endif
 

diff --git a/build/Makefile.global b/build/Makefile.global
index 4790e75d374219c31a16ad1afc94f69dc3b90d78..7774e70c4540ed2bcebf3899faabadfcdc67b100 100644 (file)
--- a/build/Makefile.global
+++ b/build/Makefile.global
@@ -118,7 +118,7 @@ clean:
        rm -f libphp$(PHP_MAJOR_VERSION).la $(SAPI_CLI_PATH) $(SAPI_CGI_PATH) $(SAPI_LITESPEED_PATH) $(SAPI_FPM_PATH) $(OVERALL_TARGET) modules/* libs/*
 
 distclean: clean
-       rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h TSRM/tsrm_config.h
+       rm -f Makefile config.cache config.log config.status Makefile.objects Makefile.fragments libtool main/php_config.h main/internal_functions_cli.c main/internal_functions.c Zend/zend_dtrace_gen.h Zend/zend_dtrace_gen.h.bak Zend/zend_config.h
        rm -f main/build-defs.h scripts/phpize
        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

diff --git a/configure.ac b/configure.ac
index 8f15c1a446f6c6e45ff3d138bdfd02ee0c684e45..199e2435a562aa4adf96e19e55ddaa8770cb1aa5 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -1624,9 +1624,6 @@ fi
 # Create configuration headers
 #
 
-test -d TSRM || $php_shtool mkdir TSRM
-echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h
-
 test -d Zend || $php_shtool mkdir Zend
 
 cat >Zend/zend_config.h <<FEO