Merge branch 'master' of github.com:zmap/zmap

This commit is contained in:
Zakir Durumeric 2013-09-02 15:57:51 -04:00
commit 3406f10271

View File

@ -43,8 +43,8 @@ ifeq ($(REDIS), true)
endif endif
ifeq ($(JSON), true) ifeq ($(JSON), true)
LDLIBS+=-L/usr/local/lib -ljson-c LDLIBS+=$(shell pkg-config --libs json-c)
CFLAGS+=-DJSON -I/usr/local/include/json-c CFLAGS+=-DJSON $(shell pkg-config --cflags json-c)
objects+=module_json.o objects+=module_json.o
endif endif