MFH: - Fix outside-source-tree builds. Always include generated header files

       with #include <some_header.h> to make sure the correct file is used.

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 87f5ad94b7459b70ddacaaed530689d65c00ea6d..d33240fa1e6ffdbcb1947b042a05cfec6cf0f3dc 100644 (file)
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@@ -15,7 +15,7 @@
 
 /* #ifndef WIN32 */
 #if !defined(WIN32) && !defined(NETWARE)
-# include "tsrm_config.h"
+# include <tsrm_config.h>
 #endif
 
 #ifdef WIN32

diff --git a/TSRM/tsrm_config_common.h b/TSRM/tsrm_config_common.h
index 9930a51a69b137551aafca27df3d297c16ad4d61..a029bfaa9632a86d0f29b06d2125ddbc25b06f6e 100644 (file)
--- a/TSRM/tsrm_config_common.h
+++ b/TSRM/tsrm_config_common.h
@@ -10,7 +10,7 @@
 #elif defined(NETWARE)
 # include "tsrm_config.nw.h"
 #else
-# include "tsrm_config.h"
+# include <tsrm_config.h>
 # include <sys/param.h>
 #endif
 

diff --git a/Zend/zend.h b/Zend/zend.h
index f5a81fc85b30ab251e0da9b5b34a8518af51a607..0fcbdfe18b442a5b764a6487aa40698bc7c13020 100644 (file)
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -47,10 +47,10 @@
 # include "zend_config.nw.h"
 # include "acconfig.h"
 #elif defined(__riscos__)
-# include "zend_config.h"
+# include <zend_config.h>
 # define ZEND_PATHS_SEPARATOR          ';'
 #else
-# include "zend_config.h"
+# include <zend_config.h>
 # define ZEND_PATHS_SEPARATOR          ':'
 #endif
 

diff --git a/configure.in b/configure.in
index bf5b75334e0aaea14b759ee465bd1c1b1da15ce6..fa545c18d3e91f3c58e1cadc2cec4ce8dd3aec85 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1305,12 +1305,12 @@ fi
 #
 
 test -d TSRM || $php_shtool mkdir TSRM
-echo '#include "../main/php_config.h"' > TSRM/tsrm_config.h
+echo '#include <../main/php_config.h>' > TSRM/tsrm_config.h
 
 test -d Zend || $php_shtool mkdir Zend
 
 cat >Zend/zend_config.h <<FEO
-#include "../main/php_config.h"
+#include <../main/php_config.h>
 #if defined(APACHE) && defined(PHP_API_VERSION)
 #undef HAVE_DLFCN_H
 #endif

diff --git a/ext/bcmath/libbcmath/src/config.h b/ext/bcmath/libbcmath/src/config.h
index 89e3e43b698c4b42509d0ed66e22504d0181561b..e1b46cbc86163fca61b49caf432e33c0af4c21b3 100644 (file)
--- a/ext/bcmath/libbcmath/src/config.h
+++ b/ext/bcmath/libbcmath/src/config.h
@@ -3,7 +3,7 @@
 #elif defined(NETWARE)
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #include "php.h"

diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c
index fa82de5f40e3019117281d66eb674d0e4bb958e0..63df228de9f24a7e3f7a19797ef4af23abfcfcdf 100644 (file)
--- a/ext/gd/gdcache.c
+++ b/ext/gd/gdcache.c
@@ -42,7 +42,7 @@
 #if PHP_WIN32
 #define ENABLE_GD_TTF
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 #if (HAVE_LIBTTF | HAVE_LIBFREETYPE) && !defined(HAVE_GD_CACHE_CREATE)
 

diff --git a/ext/gd/gdttf.c b/ext/gd/gdttf.c
index b38b182317e2d287a1f9c2731c60c922653cec57..56154835d28f1ae3de501e7a08be20f16d5da7b3 100644 (file)
--- a/ext/gd/gdttf.c
+++ b/ext/gd/gdttf.c
@@ -9,7 +9,7 @@
 #if PHP_WIN32
 #include "config.w32.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 #if HAVE_LIBTTF && !defined(USE_GD_IMGSTRTTF)
 #include <stdio.h>

diff --git a/ext/mcve/mcve.c b/ext/mcve/mcve.c
index 663ba7201389e8c6ce39ccc08bd3365c63178c2a..b0dc6978054257e4dbe37f66aeb235dedf39ad08 100644 (file)
--- a/ext/mcve/mcve.c
+++ b/ext/mcve/mcve.c
@@ -30,7 +30,7 @@
 #elif defined NETWARE
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #if HAVE_MCVE

diff --git a/ext/odbc/birdstep.c b/ext/odbc/birdstep.c
index 24b88d242b362d752de6970bb3ee25b93f988ccd..5a3e0441b5f5a1f3b56717f927ace1ae71c2c2a6 100644 (file)
--- a/ext/odbc/birdstep.c
+++ b/ext/odbc/birdstep.c
@@ -39,7 +39,7 @@
 #  define PHPAPI __declspec(dllimport) 
 # endif
 #else
-# include "php_config.h"
+# include <php_config.h>
 # define PHPAPI
 # define THREAD_LS
 #endif

diff --git a/ext/pcre/pcrelib/internal.h b/ext/pcre/pcrelib/internal.h
index 544f1c2736150cf6a3f1388a809cb8ad316fdc94..43039570f00693329db7b8842d5ae4456b431068 100644 (file)
--- a/ext/pcre/pcrelib/internal.h
+++ b/ext/pcre/pcrelib/internal.h
@@ -42,7 +42,7 @@ modules, but which are not relevant to the outside. */
 #elif defined(NETWARE)
 # include "config.nw.h"
 #else
-# include "php_config.h"
+# include <php_config.h>
 #endif
 
 #ifndef PCRE_SPY

diff --git a/ext/sqlite/config.m4 b/ext/sqlite/config.m4
index bec92bbb6eb85cf7d259dcbb5af386d41e49f952..a179597dba9159418aa82ee3f7eedd1df6d0427a 100644 (file)
--- a/ext/sqlite/config.m4
+++ b/ext/sqlite/config.m4
@@ -91,7 +91,7 @@ if test "$PHP_SQLITE" != "no"; then
     sed -e s/--VERS--/$SQLITE_VERSION/ -e s/--ENCODING--/$SQLITE_ENCODING/ $ext_srcdir/libsqlite/src/sqlite.h.in >$ext_srcdir/libsqlite/src/sqlite.h
 
     if test "$ext_shared" = "no"; then
-      echo '#include "php_config.h"' > $ext_srcdir/libsqlite/src/config.h
+      echo '#include <php_config.h>' > $ext_srcdir/libsqlite/src/config.h
     else
       echo "#include \"$abs_builddir/config.h\"" > $ext_srcdir/libsqlite/src/config.h
     fi

diff --git a/ext/standard/html.c b/ext/standard/html.c
index e3a38c3d1572547809b2973a2c4399420a6b8383..3dc6e072aa1a6a9883820286829f6c3cddb5db3a 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -35,7 +35,7 @@
 #elif defined NETWARE
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 #include "reg.h"
 #include "html.h"

diff --git a/main/alloca.c b/main/alloca.c
index ae28159913ae0eac1020003ecb265526535e174a..401649cee091c79dc946c88d4fd62b8df31e5f80 100644 (file)
--- a/main/alloca.c
+++ b/main/alloca.c
@@ -23,7 +23,7 @@
 
 /* $Id$ */
 
-#include "php_config.h"
+#include <php_config.h>
 
 #if !HAVE_ALLOCA
 

diff --git a/main/php_compat.h b/main/php_compat.h
index 4645feaa987d5040644a5681ce6d24cde64a8413..5bdd6c8ef9a6c11f3a16d6428d28202de63b4969 100644 (file)
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -26,7 +26,7 @@
 #elif defined(NETWARE)
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #if defined(HAVE_BUNDLED_PCRE) || !defined(PHP_VERSION)

diff --git a/main/php_scandir.c b/main/php_scandir.c
index e24b4137f5945ccef1ce0dc5f0b5586488938e94..da35c59f98d1889c7d834c92a25789d7968cdab5 100644 (file)
--- a/main/php_scandir.c
+++ b/main/php_scandir.c
@@ -22,7 +22,7 @@
 #ifdef PHP_WIN32
 #include "config.w32.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #include "php_scandir.h"

diff --git a/main/php_scandir.h b/main/php_scandir.h
index 0ff56ebbc2c3df43e55ce3e0d435a645f1464cde..755fe43cc52d95808f7637d9a0f3cc06bb43da20 100644 (file)
--- a/main/php_scandir.h
+++ b/main/php_scandir.h
@@ -32,7 +32,7 @@
 #include "config.w32.h"
 #include "win32/readdir.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 #ifdef HAVE_DIRENT_H

diff --git a/main/php_sprintf.c b/main/php_sprintf.c
index 52a84906512e3509efacd93750bedb994c022bc7..7e5e12fb339c04c12334413cfe73b04cc5361109 100644 (file)
--- a/main/php_sprintf.c
+++ b/main/php_sprintf.c
@@ -26,7 +26,7 @@
 #elif defined NETWARE
 #include "config.nw.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif
 
 PHPAPI int

diff --git a/main/php_syslog.h b/main/php_syslog.h
index 3f93f28ee1f53d07dd298b4f726982986c30b0ba..2a59d41ab5380f02534e3b19948d90afd295f5c9 100644 (file)
--- a/main/php_syslog.h
+++ b/main/php_syslog.h
@@ -29,7 +29,7 @@
 #include <syslog.h>
 #endif
 #else
-#include "php_config.h"
+#include <php_config.h>
 #ifdef HAVE_SYSLOG_H
 #include <syslog.h>
 #endif

diff --git a/sapi/cgi/libfcgi/include/fcgi_config.h b/sapi/cgi/libfcgi/include/fcgi_config.h
index bb031a0bb7a2124ef118595f9b1a2eb596ffed35..07236793b2bb7aeb897a2118f8f62cb33ad21c27 100644 (file)
--- a/sapi/cgi/libfcgi/include/fcgi_config.h
+++ b/sapi/cgi/libfcgi/include/fcgi_config.h
@@ -2,6 +2,6 @@
 #ifdef _WIN32
 #include "fcgi_config_win32.h"
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif