Skip to content

Commit

Permalink
Fixed json lib dependency
Browse files Browse the repository at this point in the history
(cherry picked from commit 138813f)
  • Loading branch information
vladpaiu committed Apr 21, 2015
1 parent eed27b1 commit 7e030b8
Show file tree
Hide file tree
Showing 2 changed files with 4 additions and 2 deletions.
4 changes: 3 additions & 1 deletion modules/cachedb_mongodb/Makefile
Expand Up @@ -13,11 +13,13 @@ ifeq ($(CROSS_COMPILE),)
JSON_BUILDER = $(shell \
if pkg-config --exists json; then \
echo 'pkg-config json'; \
elif pkg-config --exists json-c; then\
echo 'pkg-config json-c'; \
fi)
endif

ifeq ($(JSON_BUILDER),)
DEFS += -I$(LOCALBASE)/include
DEFS += -I$(LOCALBASE)/include -I$(SYSBASE)/include
LIBS += -L$(LOCALBASE)/lib -ljson
else
DEFS += $(shell $(JSON_BUILDER) --cflags)
Expand Down
2 changes: 1 addition & 1 deletion modules/cachedb_mongodb/cachedb_mongodb_dbase.h
Expand Up @@ -34,7 +34,7 @@
#include <mongo.h>
#include <bson.h>

#include <json/json.h>
#include <json.h>
#include <stdint.h>

extern int mongo_op_timeout;
Expand Down

0 comments on commit 7e030b8

Please sign in to comment.