Skip to content

Preferably include from build dir #13516

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 5 commits into from
Jun 25, 2024
Merged

Preferably include from build dir #13516

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
24a390a
Include from build dir first
arnaud-lb Feb 26, 2024
bbd371a
Fix extension include path for out of tree builds
arnaud-lb Feb 27, 2024
ab28632
Revert unnecessary php.m4 change
arnaud-lb Mar 5, 2024
dada90e
Remove CORE_INCLUDES and use exclusively INCLUDES
arnaud-lb Mar 5, 2024
4adb2ae
Include config.h with the brackets form
arnaud-lb Mar 5, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions TSRM/TSRM.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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>
Expand Down
3 changes: 1 addition & 2 deletions build/Makefile.global
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
15 changes: 8 additions & 7 deletions configure.ac
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1351,13 +1351,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
Expand Down
2 changes: 1 addition & 1 deletion ext/bcmath/bcmath.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/bz2/bz2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/bz2/bz2_filter.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/calendar/calendar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_com.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_dotnet.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_extension.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include <intsafe.h>
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_handlers.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_iterator.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_misc.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_olechar.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_persist.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
* (can wait till 5.1) */

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_saproxy.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* */

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_typeinfo.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_variant.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/com_dotnet/com_wrapper.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@
* using IDispatchEx */

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/ctype/ctype.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/interface.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/multi.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/curl/share.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
#define ZEND_INCLUDE_FULL_WINDOWS_HEADERS

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_cdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_db1.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_db2.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_db3.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_db4.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_dbm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_flatfile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_gdbm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_inifile.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_lmdb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_ndbm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_qdbm.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dba/dba_tcadb.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/attr.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/cdatasection.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/characterdata.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/comment.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
2 changes: 1 addition & 1 deletion ext/dom/document.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,7 @@
*/

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

#include "php.h"
Expand Down
Loading