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

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

18 files changed, 20 insertions, 20 deletions

diff --git a/TSRM/TSRM.h b/TSRM/TSRM.h
index 87f5ad94b7..d33240fa1e 100644
--- 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 9930a51a69..a029bfaa96 100644
--- 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 b5aee896fb..a52dfcc16a 100644
--- a/Zend/zend.h
+++ b/Zend/zend.h
@@ -48,10 +48,10 @@
 # include "acconfig.h"
 # define ZEND_PATHS_SEPARATOR		';'
 #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 cbcfd1259a..28915454d0 100644
--- a/configure.in
+++ b/configure.in
@@ -1338,12 +1338,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 89e3e43b69..e1b46cbc86 100644
--- 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 fa82de5f40..63df228de9 100644
--- 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 b38b182317..56154835d2 100644
--- 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 663ba72013..b0dc697805 100644
--- 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 24b88d242b..5a3e0441b5 100644
--- 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 544f1c2736..43039570f0 100644
--- 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 828a31ae97..0de50a040f 100644
--- 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 e3a38c3d15..3dc6e072aa 100644
--- 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 ae28159913..401649cee0 100644
--- 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 5f11e0635b..ceb5cf8882 100644
--- 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.h b/main/php_scandir.h
index 7a2037fdf1..e963a8a33e 100644
--- a/main/php_scandir.h
+++ b/main/php_scandir.h
@@ -34,7 +34,7 @@
 #elif NETWARE
 #include "config.nw.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 52a8490651..7e5e12fb33 100644
--- 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 3f93f28ee1..2a59d41ab5 100644
--- 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 bb031a0bb7..07236793b2 100644
--- 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