1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
|
From e5dc035216dc2e83d946682deb154ec839d67df9 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 30 Apr 2026 16:45:39 +0200
Subject: [PATCH] PHPC-2715: fix out-of-sources-tree builds
---
config.m4 | 17 +++++++++--------
1 file changed, 9 insertions(+), 8 deletions(-)
diff --git a/config.m4 b/config.m4
index aa1a2afc9..e325d5f7a 100644
--- a/config.m4
+++ b/config.m4
@@ -387,6 +387,7 @@ if test "$PHP_MONGODB" != "no"; then
dnl of build layout. Using $PWD here breaks PHP in-tree builds because $PWD is
dnl the PHP source/build root, not the extension's subdirectory within it.
php_mongodb_ext_builddir=PHP_EXT_BUILDDIR(mongodb)
+ php_mongodb_ext_srcdir=PHP_EXT_SRCDIR(mongodb)
dnl Add the build directories as include paths so the compiler finds generated
dnl config headers (common-config.h, bson/config.h, mongoc-config.h, etc.).
@@ -419,12 +420,12 @@ if test "$PHP_MONGODB" != "no"; then
dnl For standalone out-of-source builds this stays in the build tree; for
dnl PHP in-tree builds it lands under ext/mongodb/ rather than the PHP root.
AC_CONFIG_FILES([
- ${php_mongodb_ext_builddir}/src/libmongoc/src/common/src/common-config.h
- ${php_mongodb_ext_builddir}/src/libmongoc/src/libbson/src/bson/config.h
- ${php_mongodb_ext_builddir}/src/libmongoc/src/libbson/src/bson/version.h
- ${php_mongodb_ext_builddir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h
- ${php_mongodb_ext_builddir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h
- ${php_mongodb_ext_builddir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h
+ ${php_mongodb_ext_srcdir}/src/libmongoc/src/common/src/common-config.h
+ ${php_mongodb_ext_srcdir}/src/libmongoc/src/libbson/src/bson/config.h
+ ${php_mongodb_ext_srcdir}/src/libmongoc/src/libbson/src/bson/version.h
+ ${php_mongodb_ext_srcdir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config.h
+ ${php_mongodb_ext_srcdir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-config-private.h
+ ${php_mongodb_ext_srcdir}/src/libmongoc/src/libmongoc/src/mongoc/mongoc-version.h
])
if test "x$bundled_utf8proc" = "xyes"; then
@@ -439,7 +440,7 @@ if test "$PHP_MONGODB" != "no"; then
PHP_MONGODB_ADD_SOURCES([src/libmongoc/src/zlib-1.3.1/], $PHP_MONGODB_ZLIB_SOURCES, $PHP_MONGODB_ZLIB_CFLAGS)
PHP_MONGODB_ADD_INCLUDE([src/libmongoc/src/zlib-1.3.1/])
PHP_MONGODB_ADD_BUILD_DIR([src/libmongoc/src/zlib-1.3.1/])
- AC_CONFIG_FILES([${php_mongodb_ext_builddir}/src/libmongoc/src/zlib-1.3.1/zconf.h])
+ AC_CONFIG_FILES([${php_mongodb_ext_srcdir}/src/libmongoc/src/zlib-1.3.1/zconf.h])
fi
if test "$PHP_MONGODB_CLIENT_SIDE_ENCRYPTION" = "yes"; then
@@ -478,7 +479,7 @@ if test "$PHP_MONGODB" != "no"; then
PHP_MONGODB_ADD_BUILD_DIR([src/libmongocrypt/kms-message/src/])
AC_CONFIG_FILES([
- ${php_mongodb_ext_builddir}/src/libmongocrypt/src/mongocrypt-config.h
+ ${php_mongodb_ext_srcdir}/src/libmongocrypt/src/mongocrypt-config.h
])
fi
fi
|
