diff options
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | TSRM/TSRM.h | 2 | ||||
| -rw-r--r-- | TSRM/tsrm_config_common.h | 2 | ||||
| -rw-r--r-- | build/Makefile.global | 2 | ||||
| -rw-r--r-- | configure.ac | 3 |
5 files changed, 3 insertions, 7 deletions
diff --git a/.gitignore b/.gitignore index 8ed6d44385..e9763d84f4 100644 --- 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 db4b970bf6..9a5940ea5f 100644 --- 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 d3c7672d48..dac64b0400 100644 --- 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 4790e75d37..7774e70c45 100644 --- 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 0c3e73cb5e..90c30b9e22 100644 --- a/configure.ac +++ b/configure.ac @@ -1625,9 +1625,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 |