kamailio4: update to version 4.1.4

Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
This commit is contained in:
Jiri Slachta 2014-07-17 14:08:49 +02:00
parent 04dc3e9df4
commit 90fdcfaf97
3 changed files with 3 additions and 41 deletions

View file

@ -8,12 +8,12 @@
include $(TOPDIR)/rules.mk include $(TOPDIR)/rules.mk
PKG_NAME:=kamailio4 PKG_NAME:=kamailio4
PKG_VERSION:=4.1.2 PKG_VERSION:=4.1.4
PKG_RELEASE:=2 PKG_RELEASE:=1
PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/ PKG_SOURCE_URL:=http://www.kamailio.org/pub/kamailio/$(PKG_VERSION)/src/
PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz PKG_SOURCE:=kamailio-$(PKG_VERSION)$(PKG_VARIANT)_src.tar.gz
PKG_MD5SUM:=7d48479293db2508045cf7788375f431 PKG_MD5SUM:=f4a939c5eaf80072a9239980d94cd8e1
PKG_USE_MIPS16:=0 PKG_USE_MIPS16:=0
INCL_MODULES:= INCL_MODULES:=

View file

@ -1,19 +0,0 @@
--- a/modules/json/Makefile
+++ b/modules/json/Makefile
@@ -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

@ -1,19 +0,0 @@
--- a/modules/jsonrpc-c/Makefile
+++ b/modules/jsonrpc-c/Makefile
@@ -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