kamailio4: fix json modules

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
This commit is contained in:
Jiri Slachta 2013-05-31 13:19:39 +02:00
parent ec45f5bd1d
commit a4d572ce08
2 changed files with 38 additions and 0 deletions

View file

@ -0,0 +1,19 @@
--- kamailio4-4.0.1/modules/json/Makefile 2013-04-25 16:56:29.000000000 +0200
+++ kamailio4-next/modules/json/Makefile 2013-05-31 10:54:42.125995025 +0200
@@ -11,12 +11,12 @@ LIBS=
BUILDER = $(shell which pkg-config)
ifeq ($(BUILDER),)
- DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \
+ DEFS+=-I/usr/include/json-c -I$(LOCALBASE)/include/json-c \
-I$(LOCALBASE)/include
- LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson
+ LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -ljson-c
else
- DEFS+= $(shell pkg-config --cflags json)
- LIBS+= $(shell pkg-config --libs json)
+ DEFS+= $(shell pkg-config --cflags json-c)
+ LIBS+= $(shell pkg-config --libs json-c)
endif
DEFS+=-DKAMAILIO_MOD_INTERFACE

View file

@ -0,0 +1,19 @@
--- kamailio4-4.0.1/modules/jsonrpc-c/Makefile 2013-04-25 16:56:29.000000000 +0200
+++ kamailio4-next/modules/jsonrpc-c/Makefile 2013-05-31 10:58:00.689999015 +0200
@@ -11,12 +11,12 @@ LIBS=-lm
BUILDER = $(shell which pkg-config)
ifeq ($(BUILDER),)
- DEFS+=-I/usr/include/json -I$(LOCALBASE)/include/json \
+ DEFS+=-I/usr/include/json-c -I$(LOCALBASE)/include/json-c \
-I$(LOCALBASE)/include
- LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson
+ LIBS+=-L$(SYSBASE)/include/lib -L$(LOCALBASE)/lib -levent -ljson-c
else
- DEFS+= $(shell pkg-config --cflags json)
- LIBS+= $(shell pkg-config --libs json)
+ DEFS+= $(shell pkg-config --cflags json-c)
+ LIBS+= $(shell pkg-config --libs json-c)
DEFS+= $(shell pkg-config --cflags libevent)
LIBS+= $(shell pkg-config --libs libevent)
endif