diff options
| author | David M. Lee <dlee@digium.com> | 2013-03-22 20:51:33 +0000 |
|---|---|---|
| committer | David M. Lee <dlee@digium.com> | 2013-03-22 20:51:33 +0000 |
| commit | 766c146fe3bbbcef8dc93f6669d4fa28cce3b624 (patch) | |
| tree | de8a7dfc96d971a832d7378dea5c40d28aeb9ce8 /main | |
| parent | 2a65c9408c6e590d10d974b758a7c42ee824b923 (diff) | |
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
Diffstat (limited to 'main')
| -rw-r--r-- | main/Makefile | 1 | ||||
| -rw-r--r-- | main/json.c | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/main/Makefile b/main/Makefile index 62ba555cc..9b825bd45 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 b91707a8a..edffcc945 100644 --- a/main/json.c +++ b/main/json.c @@ -27,7 +27,6 @@ */ /*** MODULEINFO - <depend>jansson</depend> <support_level>core</support_level> ***/ |