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

diff --git a/main/Makefile b/main/Makefile
index 62ba555cceef83e151cf3a2e61924aa762e0aa43..9b825bd45241e7ce98cf5863e2ccdab7a6560e3d 100644 (file)
--- 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 b91707a8a608129f9e537c5f58edc150861c2662..edffcc9451b7d011128c8ddaae624ac20e296758 100644 (file)
--- a/main/json.c
+++ b/main/json.c
@@ -27,7 +27,6 @@
  */
 
 /*** MODULEINFO
-       <depend>jansson</depend>
        <support_level>core</support_level>
  ***/