From 766c146fe3bbbcef8dc93f6669d4fa28cce3b624 Mon Sep 17 00:00:00 2001 From: "David M. Lee" <dlee@digium.com> Date: Fri, 22 Mar 2013 20:51:33 +0000 Subject: [PATCH] Fixed another issue from r383579. Core modules don't honor <depend> flags in MODULEINFO, which broke jansson if specified --with-jansson to configure. git-svn-id: https://origsvn.digium.com/svn/asterisk/trunk@383633 65c4cc65-6c06-0410-ace0-fbb531ad65f3 --- main/Makefile | 1 + main/json.c | 1 - 2 files changed, 1 insertion(+), 1 deletion(-) diff --git a/main/Makefile b/main/Makefile index 62ba555cce..9b825bd452 100644 --- a/main/Makefile +++ b/main/Makefile @@ -151,6 +151,7 @@ endif db.o: _ASTCFLAGS+=$(SQLITE3_INCLUDE) asterisk.o: _ASTCFLAGS+=$(LIBEDIT_INCLUDE) cli.o: _ASTCFLAGS+=$(LIBEDIT_INCLUDE) +json.o: _ASTCFLAGS+=$(JANSSON_INCLUDE) ifneq ($(findstring ENABLE_UPLOADS,$(MENUSELECT_CFLAGS)),) http.o: _ASTCFLAGS+=$(GMIME_INCLUDE) diff --git a/main/json.c b/main/json.c index b91707a8a6..edffcc9451 100644 --- a/main/json.c +++ b/main/json.c @@ -27,7 +27,6 @@ */ /*** MODULEINFO - <depend>jansson</depend> <support_level>core</support_level> ***/ -- GitLab