Preferably include from build dir (#13516)

* Include from build dir first This fixes out of tree builds by ensuring that configure artifacts are included from the build dir. Before, out of tree builds would preferably include files from the src dir, as the include path was defined as follows (ignoring includes from ext/ and sapi/) : -I$(top_builddir)/main -I$(top_srcdir) -I$(top_builddir)/TSRM -I$(top_builddir)/Zend -I$(top_srcdir)/main -I$(top_srcdir)/Zend -I$(top_srcdir)/TSRM -I$(top_builddir)/ As a result, an out of tree build would include configure artifacts such as `main/php_config.h` from the src dir. After this change, the include path is defined as follows: -I$(top_builddir)/main -I$(top_builddir) -I$(top_srcdir)/main -I$(top_srcdir) -I$(top_builddir)/TSRM -I$(top_builddir)/Zend -I$(top_srcdir)/Zend -I$(top_srcdir)/TSRM * Fix extension include path for out of tree builds * Include config.h with the brackets form `#include "config.h"` searches in the directory containing the including-file before any other include path. This can include the wrong config.h when building out of tree and a config.h exists in the source tree. Using `#include <config.h>` uses exclusively the include path, and gives priority to the build dir.
2024-11-23 01:44:06 +08:00 · 2024-06-26 00:26:43 +02:00 · 2024-06-26 00:26:43 +02:00 · 11accb5cdf
commit 11accb5cdf
parent 604e0a7bbe
193 changed files with 202 additions and 202 deletions
--- a/TSRM/TSRM.h
+++ b/TSRM/TSRM.h
@ -15,9 +15,9 @@

 #if !defined(__CYGWIN__) && defined(_WIN32)
 # define TSRM_WIN32
-# include "Zend/zend_config.w32.h"
+# include <Zend/zend_config.w32.h>
 #else
-# include "main/php_config.h"
+# include <main/php_config.h>
 #endif

 #include <stdint.h>
--- a/build/Makefile.global
+++ b/build/Makefile.global
@ -2,8 +2,7 @@ mkinstalldirs = $(top_srcdir)/build/shtool mkdir -p
 INSTALL = $(top_srcdir)/build/shtool install -c
 INSTALL_DATA = $(INSTALL) -m 644

-DEFS = -I$(top_builddir)/main -I$(top_srcdir)
-COMMON_FLAGS = $(DEFS) $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)
+COMMON_FLAGS = $(INCLUDES) $(EXTRA_INCLUDES) $(CPPFLAGS) $(PHP_FRAMEWORKPATH)

 all: $(all_targets)
 	@echo
--- a/configure.ac
+++ b/configure.ac
@ -1353,13 +1353,14 @@ LIBZEND_BASIC_CHECKS
 LIBZEND_DLSYM_CHECK
 LIBZEND_OTHER_CHECKS

-INCLUDES="$INCLUDES -I\$(top_builddir)/TSRM"
-INCLUDES="$INCLUDES -I\$(top_builddir)/Zend"
-
-if test "$abs_srcdir" != "$abs_builddir"; then
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/main -I\$(top_srcdir)/Zend"
-  INCLUDES="$INCLUDES -I\$(top_srcdir)/TSRM -I\$(top_builddir)/"
-fi
+PHP_ADD_INCLUDE([$abs_srcdir], [1])
+PHP_ADD_INCLUDE([$abs_srcdir/main], [1])
+PHP_ADD_INCLUDE([$abs_builddir], [1])
+PHP_ADD_INCLUDE([$abs_builddir/main], [1])
+PHP_ADD_INCLUDE([$abs_builddir/TSRM])
+PHP_ADD_INCLUDE([$abs_builddir/Zend])
+PHP_ADD_INCLUDE([$abs_srcdir/Zend])
+PHP_ADD_INCLUDE([$abs_srcdir/TSRM])

 ZEND_EXTRA_LIBS="$LIBS"
 unset LIBS
--- a/ext/bcmath/bcmath.c
+++ b/ext/bcmath/bcmath.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/bz2/bz2.c
+++ b/ext/bz2/bz2.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/bz2/bz2_filter.c
+++ b/ext/bz2/bz2_filter.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/calendar/calendar.c
+++ b/ext/calendar/calendar.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_com.c
+++ b/ext/com_dotnet/com_com.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_dotnet.c
+++ b/ext/com_dotnet/com_dotnet.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_extension.c
+++ b/ext/com_dotnet/com_extension.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <intsafe.h>
--- a/ext/com_dotnet/com_handlers.c
+++ b/ext/com_dotnet/com_handlers.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_iterator.c
+++ b/ext/com_dotnet/com_iterator.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_misc.c
+++ b/ext/com_dotnet/com_misc.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_olechar.c
+++ b/ext/com_dotnet/com_olechar.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_persist.c
+++ b/ext/com_dotnet/com_persist.c
@ -20,7 +20,7 @@
 * (can wait till 5.1) */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_saproxy.c
+++ b/ext/com_dotnet/com_saproxy.c
@ -22,7 +22,7 @@
 * */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_typeinfo.c
+++ b/ext/com_dotnet/com_typeinfo.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_variant.c
+++ b/ext/com_dotnet/com_variant.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/com_dotnet/com_wrapper.c
+++ b/ext/com_dotnet/com_wrapper.c
@ -18,7 +18,7 @@
 * using IDispatchEx */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/ctype/ctype.c
+++ b/ext/ctype/ctype.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/curl/interface.c
+++ b/ext/curl/interface.c
@ -17,7 +17,7 @@
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/curl/multi.c
+++ b/ext/curl/multi.c
@ -17,7 +17,7 @@
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/curl/share.c
+++ b/ext/curl/share.c
@ -17,7 +17,7 @@
 #define ZEND_INCLUDE_FULL_WINDOWS_HEADERS

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba.c
+++ b/ext/dba/dba.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_cdb.c
+++ b/ext/dba/dba_cdb.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_db1.c
+++ b/ext/dba/dba_db1.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_db2.c
+++ b/ext/dba/dba_db2.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_db3.c
+++ b/ext/dba/dba_db3.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_db4.c
+++ b/ext/dba/dba_db4.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_dbm.c
+++ b/ext/dba/dba_dbm.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_flatfile.c
+++ b/ext/dba/dba_flatfile.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_gdbm.c
+++ b/ext/dba/dba_gdbm.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_inifile.c
+++ b/ext/dba/dba_inifile.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_lmdb.c
+++ b/ext/dba/dba_lmdb.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_ndbm.c
+++ b/ext/dba/dba_ndbm.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_qdbm.c
+++ b/ext/dba/dba_qdbm.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dba/dba_tcadb.c
+++ b/ext/dba/dba_tcadb.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/attr.c
+++ b/ext/dom/attr.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/cdatasection.c
+++ b/ext/dom/cdatasection.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/characterdata.c
+++ b/ext/dom/characterdata.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/comment.c
+++ b/ext/dom/comment.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/document.c
+++ b/ext/dom/document.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/documentfragment.c
+++ b/ext/dom/documentfragment.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/documenttype.c
+++ b/ext/dom/documenttype.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/dom_iterators.c
+++ b/ext/dom/dom_iterators.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/domexception.c
+++ b/ext/dom/domexception.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/domimplementation.c
+++ b/ext/dom/domimplementation.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/element.c
+++ b/ext/dom/element.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/entity.c
+++ b/ext/dom/entity.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/entityreference.c
+++ b/ext/dom/entityreference.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/html5_parser.c
+++ b/ext/dom/html5_parser.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/html5_serializer.c
+++ b/ext/dom/html5_serializer.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/html_document.c
+++ b/ext/dom/html_document.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/namednodemap.c
+++ b/ext/dom/namednodemap.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/namespace_compat.c
+++ b/ext/dom/namespace_compat.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/node.c
+++ b/ext/dom/node.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/nodelist.c
+++ b/ext/dom/nodelist.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/notation.c
+++ b/ext/dom/notation.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/parentnode.c
+++ b/ext/dom/parentnode.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/php_dom.c
+++ b/ext/dom/php_dom.c
@ -17,7 +17,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/processinginstruction.c
+++ b/ext/dom/processinginstruction.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/text.c
+++ b/ext/dom/text.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/xml_document.c
+++ b/ext/dom/xml_document.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/xpath.c
+++ b/ext/dom/xpath.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/dom/xpath_callbacks.c
+++ b/ext/dom/xpath_callbacks.c
@ -17,7 +17,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/enchant/enchant.c
+++ b/ext/enchant/enchant.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/exif/exif.c
+++ b/ext/exif/exif.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/fileinfo/fileinfo.c
+++ b/ext/fileinfo/fileinfo.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif
 #include "php.h"

--- a/ext/filter/filter.c
+++ b/ext/filter/filter.c
@ -18,7 +18,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_filter.h"
--- a/ext/ftp/ftp.c
+++ b/ext/ftp/ftp.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/ftp/php_ftp.c
+++ b/ext/ftp/php_ftp.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/gd/gd.c
+++ b/ext/gd/gd.c
@ -22,7 +22,7 @@
 /* Note that there is no code from the gd package in this file */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/gd/gd_compat.c
+++ b/ext/gd/gd_compat.c
@ -1,7 +1,7 @@
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #else
-#include "php_config.h"
+#include <php_config.h>
 #endif

 #include "gd_compat.h"
--- a/ext/gettext/gettext.c
+++ b/ext/gettext/gettext.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/gmp/gmp.c
+++ b/ext/gmp/gmp.c
@ -15,7 +15,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/gmp/php_gmp_int.h
+++ b/ext/gmp/php_gmp_int.h
@ -2,7 +2,7 @@
 #define incl_PHP_GMP_INT_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/hash/hash.c
+++ b/ext/hash/hash.c
@ -16,7 +16,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <math.h>
--- a/ext/iconv/iconv.c
+++ b/ext/iconv/iconv.c
@ -17,7 +17,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/intl/collator/collator_attr.c
+++ b/ext/intl/collator/collator_attr.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/collator/collator_compare.c
+++ b/ext/intl/collator/collator_compare.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/collator/collator_convert.c
+++ b/ext/intl/collator/collator_convert.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/collator/collator_create.c
+++ b/ext/intl/collator/collator_create.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/collator/collator_error.c
+++ b/ext/intl/collator/collator_error.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/collator/collator_locale.c
+++ b/ext/intl/collator/collator_locale.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/collator/collator_sort.c
+++ b/ext/intl/collator/collator_sort.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/common/common_error.c
+++ b/ext/intl/common/common_error.c
@ -14,7 +14,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/converter/converter.h
+++ b/ext/intl/converter/converter.h
@ -16,7 +16,7 @@
 #define PHP_INTL_CONVERTER_H

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php.h"
--- a/ext/intl/dateformat/dateformat.c
+++ b/ext/intl/dateformat/dateformat.c
@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <unicode/udat.h>
--- a/ext/intl/dateformat/dateformat_attr.c
+++ b/ext/intl/dateformat/dateformat_attr.c
@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "../php_intl.h"
--- a/ext/intl/dateformat/dateformat_data.c
+++ b/ext/intl/dateformat/dateformat_data.c
@ -12,7 +12,7 @@
   +----------------------------------------------------------------------+
 */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "dateformat_data.h"
--- a/ext/intl/dateformat/dateformat_format.c
+++ b/ext/intl/dateformat/dateformat_format.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "../php_intl.h"
--- a/ext/intl/dateformat/dateformat_parse.c
+++ b/ext/intl/dateformat/dateformat_parse.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <unicode/ustring.h>
--- a/ext/intl/formatter/formatter_attr.c
+++ b/ext/intl/formatter/formatter_attr.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/formatter/formatter_data.c
+++ b/ext/intl/formatter/formatter_data.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "formatter_data.h"
--- a/ext/intl/formatter/formatter_format.c
+++ b/ext/intl/formatter/formatter_format.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/formatter/formatter_main.c
+++ b/ext/intl/formatter/formatter_main.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <unicode/ustring.h>
--- a/ext/intl/formatter/formatter_parse.c
+++ b/ext/intl/formatter/formatter_parse.c
@ -13,7 +13,7 @@
 */

 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include "php_intl.h"
--- a/ext/intl/grapheme/grapheme_string.c
+++ b/ext/intl/grapheme/grapheme_string.c
@ -14,7 +14,7 @@

 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <php.h>
--- a/ext/intl/grapheme/grapheme_util.c
+++ b/ext/intl/grapheme/grapheme_util.c
@ -14,7 +14,7 @@

 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <php.h>
--- a/ext/intl/idn/idn.c
+++ b/ext/intl/idn/idn.c
@ -17,7 +17,7 @@

 /* {{{ includes */
 #ifdef HAVE_CONFIG_H
-#include "config.h"
+#include <config.h>
 #endif

 #include <php.h>
--- a/Show More
+++ b/Show More