From 8fc36e5a76e3ac9b8cbbcf70353d664b99f43e95 Mon Sep 17 00:00:00 2001
From: Remi Collet <remi@remirepo.net>
Date: Thu, 19 Feb 2026 12:46:28 +0100
Subject: [PATCH] support for libmongc/libbson version 2

---
 modules/cachedb_mongodb/Makefile                | 4 +++-
 modules/cachedb_mongodb/cachedb_mongodb_dbase.h | 4 ++--
 modules/cachedb_mongodb/cachedb_mongodb_json.h  | 2 +-
 3 files changed, 6 insertions(+), 4 deletions(-)

diff --git a/modules/cachedb_mongodb/Makefile b/modules/cachedb_mongodb/Makefile
index cd1aafc0b0d..e361505a3cb 100644
--- a/modules/cachedb_mongodb/Makefile
+++ b/modules/cachedb_mongodb/Makefile
@@ -10,7 +10,9 @@ NAME=cachedb_mongodb.so
 include ../../lib/json/Makefile.json
 ifeq ($(CROSS_COMPILE),)
 MONGOC_BUILDER := $(shell \
-	if pkg-config --exists libmongoc-1.0; then \
+	if pkg-config --exists mongoc2; then \
+		echo 'pkg-config mongoc2'; \
+	elif pkg-config --exists libmongoc-1.0; then \
 		echo 'pkg-config libmongoc-1.0'; \
 	fi)
 endif
diff --git a/modules/cachedb_mongodb/cachedb_mongodb_dbase.h b/modules/cachedb_mongodb/cachedb_mongodb_dbase.h
index cbe4855561a..0eaf766670e 100644
--- a/modules/cachedb_mongodb/cachedb_mongodb_dbase.h
+++ b/modules/cachedb_mongodb/cachedb_mongodb_dbase.h
@@ -27,8 +27,8 @@
 
 #define MONGO_HAVE_STDINT 1
 
-#include <mongoc.h>
-#include <bson.h>
+#include <mongoc/mongoc.h>
+#include <bson/bson.h>
 
 #include <stdint.h>
 
diff --git a/modules/cachedb_mongodb/cachedb_mongodb_json.h b/modules/cachedb_mongodb/cachedb_mongodb_json.h
index f3bcbd9bbc0..85bbbab8dc9 100644
--- a/modules/cachedb_mongodb/cachedb_mongodb_json.h
+++ b/modules/cachedb_mongodb/cachedb_mongodb_json.h
@@ -23,7 +23,7 @@
 
 #include "cachedb_mongodb_dbase.h"
 
-#include <bson.h>
+#include <bson/bson.h>
 #include <stdint.h>
 
 int json_to_bson(char *json,bson_t *bb);