resolve merge conflicts and move timestamp to system field.

2013-08-29 23:05:53 -04:00
parent 9d1b5210b0 c455d99298
commit 65d19a8199
6 changed files with 221 additions and 6 deletions
--- a/src/Makefile
+++ b/src/Makefile
@ -41,6 +41,12 @@ ifeq ($(REDIS), true)
 	CFLAGS+=-DREDIS
 endif

+ifeq ($(JSON), true)
+	LDLIBS += $(shell pkg-config --libs json-c)
+	CFLAGS += $(shell pkg-config --cflags json-c) -DJSON
+	objects+=module_json.o
+endif
+
 all: $(TARGETS)

 $(TARGETS):