From: David M. Lee Date: Fri, 22 Mar 2013 20:51:33 +0000 (+0000) Subject: Fixed another issue from r383579. X-Git-Tag: 13.0.0-beta1~1989 X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=766c146fe3bbbcef8dc93f6669d4fa28cce3b624;p=thirdparty%2Fasterisk.git Fixed another issue from r383579. Core modules don't honor 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 --- 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 - jansson core ***/