From 790219a5ad6a1c04540c098fefb77eee82551216 Mon Sep 17 00:00:00 2001 From: vector-of-bool Date: Wed, 29 Oct 2025 16:44:53 -0600 Subject: [PATCH 1/2] Add generated build dirs as include paths When doing an out-of-source build, certain generated headers are written into the build tree. The directories containing these headers need to be added as #include search paths for the build to succeed. --- config.m4 | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/config.m4 b/config.m4 index e8e115cd7..7f9cf22a5 100644 --- a/config.m4 +++ b/config.m4 @@ -370,6 +370,10 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libbson/src/jsonsl/], $PHP_MONGODB_JSONSL_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS) PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libmongoc/src/mongoc/], $PHP_MONGODB_MONGOC_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS) + # Add the build directories as include paths to some generated files + PHP_ADD_INCLUDE([$PWD/src/libmongoc/src/libbson/src]) + PHP_ADD_INCLUDE([$PWD/src/libmongoc/src/libmongoc/src]) + PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/common/src/]) PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/uthash/]) PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/libbson/src/]) @@ -394,11 +398,11 @@ if test "$PHP_MONGODB" != "no"; then ac_config_dir=PHP_EXT_SRCDIR(mongodb) AC_CONFIG_FILES([ - ${ac_config_dir}/src/libmongoc/src/common/src/common-config.h - ${ac_config_dir}/src/libmongoc/src/libbson/src/bson/config.h - ${ac_config_dir}/src/libmongoc/src/libbson/src/bson/version.h - ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h - ${ac_config_dir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h + src/libmongoc/src/common/src/common-config.h + src/libmongoc/src/libbson/src/bson/config.h + src/libmongoc/src/libbson/src/bson/version.h + src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h + src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h ]) if test "x$bundled_utf8proc" = "xyes"; then From 49a6e07f9c11b6ac3fe7dcdac28d85709da09471 Mon Sep 17 00:00:00 2001 From: vector-of-bool Date: Thu, 30 Oct 2025 16:22:39 -0600 Subject: [PATCH 2/2] Missing common-config dir --- config.m4 | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/config.m4 b/config.m4 index 7f9cf22a5..e4de69e77 100644 --- a/config.m4 +++ b/config.m4 @@ -370,7 +370,8 @@ if test "$PHP_MONGODB" != "no"; then PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libbson/src/jsonsl/], $PHP_MONGODB_JSONSL_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS) PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/libmongoc/src/mongoc/], $PHP_MONGODB_MONGOC_SOURCES, $PHP_MONGODB_BUNDLED_CFLAGS) - # Add the build directories as include paths to some generated files + dnl Add the build directories as include paths to some generated files + PHP_ADD_INCLUDE([$PWD/src/libmongoc/src/common/src]) PHP_ADD_INCLUDE([$PWD/src/libmongoc/src/libbson/src]) PHP_ADD_INCLUDE([$PWD/src/libmongoc/src/libmongoc/src])