kamailio4: fix json modules
authorJiri Slachta <slachta@cesnet.cz>
Fri, 31 May 2013 11:19:39 +0000 (13:19 +0200)
committerJiri Slachta <slachta@cesnet.cz>
Fri, 31 May 2013 11:19:39 +0000 (13:19 +0200)
Signed-off-by: Jiri Slachta <slachta@cesnet.cz>
kamailio-4.0.x/patches/001-mod-json-fix-library-name.patch [new file with mode: 0644]
kamailio-4.0.x/patches/002-mod-jsonrpc-fix-library-name.patch [new file with mode: 0644]

diff --git a/kamailio-4.0.x/patches/001-mod-json-fix-library-name.patch b/kamailio-4.0.x/patches/001-mod-json-fix-library-name.patch
new file mode 100644 (file)
index 0000000..772aaa2
--- /dev/null
@@ -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
diff --git a/kamailio-4.0.x/patches/002-mod-jsonrpc-fix-library-name.patch b/kamailio-4.0.x/patches/002-mod-jsonrpc-fix-library-name.patch
new file mode 100644 (file)
index 0000000..d0dc962
--- /dev/null
@@ -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