Browse Source

ndb_mongodb: support mongo-c-driver version 2

related #4378
Victor Seva 2 weeks ago
parent
commit
5182f26156
2 changed files with 10 additions and 0 deletions
  1. 5 0
      src/modules/ndb_mongodb/Makefile
  2. 5 0
      src/modules/ndb_mongodb/mongodb_client.h

+ 5 - 0
src/modules/ndb_mongodb/Makefile

@@ -9,12 +9,17 @@ ifeq ($(CROSS_COMPILE),)
 MONGODBC_BUILDER=$(shell \
 	if pkg-config --exists libmongoc-1.0; then \
 		echo 'pkg-config libmongoc-1.0'; \
+	elif pkg-config --exists mongoc2; then \
+		echo 'pkg-config mongoc2'; \
 	fi)
 endif
 
 ifneq ($(MONGODBC_BUILDER),)
 	DEFS += $(shell $(MONGODBC_BUILDER) --cflags)
 	LIBS += $(shell $(MONGODBC_BUILDER) --libs)
+	ifneq ($(findstring libmongoc-1.0,$(MONGODBC_BUILDER)),)
+		DEFS += -DHAVE_LIBMONGOC1
+	endif
 else
 	DEFS += -I$(LOCALBASE)/include
 	LIBS= -L$(LOCALBASE)/lib -lmongoc

+ 5 - 0
src/modules/ndb_mongodb/mongodb_client.h

@@ -24,8 +24,13 @@
 #ifndef _MONGODB_CLIENT_H_
 #define _MONGODB_CLIENT_H_
 
+#ifdef HAVE_LIBMONGOC1
 #include <mongoc.h>
 #include <bson.h>
+#else
+#include <mongoc/mongoc.h>
+#include <bson/bson.h>
+#endif
 
 #include "../../core/str.h"
 #include "../../core/parser/parse_param.h"