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 a80500d6db0402db67a172b371c13d523570d343..46f9702bd242d22b640bacdf03a503e30f62c77f 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 24410963e30c9dfd7d6dbaf62d9598a38e20f339..23dc9bfd792ca7ba23bf7f7b1c1f7940a8b732ac 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/ext/bcmath/libbcmath/src/config.h b/ext/bcmath/libbcmath/src/config.h
index 6516f8f19beab4bffb8a8bfb1fd6ebfc672a31de..24bf4ec29ab22b7c7c0cbe42584e35845267dbc7 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 <string.h>

diff --git a/ext/gd/gdcache.c b/ext/gd/gdcache.c
index e3ff9b83addfe66c8c38547a3c911cf335df483b..00707586c3cbdf84aeb8a7bc87f2470a30d3eeb3 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 4ff659cada6376f7eb3c2c5084ee496cbf301f13..5771d66fbdfbd2174c8fbc22a526b9ec7a6bdd0e 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 19f555c567639d74079428fd27fc821cb0798469..8d2934254d3d962caa581cb979712a721dcca1cf 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 e1ed5f15d858f46bd4380e6f13a9ff1b420c1ee1..d9bb3467a281d8afe97e5d1be6cfc50af7764aab 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/standard/html.c b/ext/standard/html.c
index 9f0ae15e2c30882233ea927d7e6242b31777c2a0..9dce03a0ae1cadb4a1b159cd6d05148ce7168d09 100644 (file)
--- a/ext/standard/html.c
+++ b/ext/standard/html.c
@@ -33,7 +33,7 @@
 #if PHP_WIN32
 #include "config.w32.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 65e3f7f5e9b36a587f8c0ce488c60af6c0133ace..66e001b900156f125e5bba1f4cae8fbd167fd30a 100644 (file)
--- a/main/alloca.c
+++ b/main/alloca.c
@@ -21,7 +21,7 @@
    allocating any.  It is a good idea to use alloca(0) in
    your main control loop, etc. to force garbage collection.  */
 
-#include "php_config.h"
+#include <php_config.h>
 
 #if !HAVE_ALLOCA
 

diff --git a/main/php_compat.h b/main/php_compat.h
index 3215d58f6f09b18d608302c1865ba657cec3ba90..6725c4fdb8fa8b7a3d357081344512115465208a 100644 (file)
--- a/main/php_compat.h
+++ b/main/php_compat.h
@@ -6,7 +6,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 139e1c27cbdfcbebdf3b6eba3f3a8993e8446b03..bd5848e88265a3c2d7dc978d385bf238103e848b 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 416e3d88cfae9a19b24e4be8d00274d975b3fd43..379a7877e60d5ccdbcb46084e859eeba92f4ad51 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_syslog.h b/main/php_syslog.h
index 92b09800fb038e797087fb2f2995ea6b0a99ab48..1e5cedf74fa5b11f91d8a609ad41b504c8a07b3e 100644 (file)
--- a/main/php_syslog.h
+++ b/main/php_syslog.h
@@ -9,7 +9,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 7ad81663e49a6af283842c531b7fce1344cd597e..eb592b0db6bba43d9130f784bac40cbae71ffe87 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